weekend

camera.py

         own['last_rot_z'] = 0
         own['idlecampos_x'] = 0
         own['speed_mult'] = 1.00 
-        controlcube['driving'] = False     
+        controlcube['driving'] = False  
+        dict['cur_ccH_min'] = dict['cam_walk_min']
+        dict['cur_ccH_max'] = dict['cam_walk_max']
+        cam.height = dict['cam_height']
     acam = scene.active_camera
-    focallength = dict['focal_length']
-    cam1.lens = focallength
-    cam2.lens = focallength
-    cam3.lens = focallength
+
 
     
     #if 1 == 1:
                 pass   
         controlcube['lastCamheight'] = cam.height    
         #########
-        cam.min = dict['cam_min']
-        cam.max = dict['cam_max']
+        #cam.min = dict['cam_min']
+        #cam.max = dict['cam_max']
         cont.activate(own.actuators['Camera'])  
         ########
         
         if rot_y == 0 and own['last_rot_y'] != 0:
             rot_y = own['last_rot_y'] * damping         
                              
-        
         move = [move_y, 0, move_x]
         freecam.applyMovement( move, True)
         freecam.applyMovement([0, 0, move_z], False)    
         freecam.applyRotation([rot_x, 0, 0],True)
         freecam.applyRotation([0, 0, rot_y],False)
-
-#        mult = .1 #* own['speed_mult']
-#        if lBump == True and own['lBump'] == False:
-#            if own['speed_mult'] > .1:
-#                own['speed_mult'] = round(own['speed_mult'] - mult, 2)
-#        if rBump == True and own['rBump'] == False:
-#            if own['speed_mult'] < 5.5:
-#                own['speed_mult'] = round(own['speed_mult'] + mult, 2)          
-            
-            
+       
         
 ################    
     #print(dict['walk'], 'walk')
     multer = .02
     if dict['walk'] == 1:
-        if dict['cur_ccH_targetHeight'] < .8:
-            dist = .8 - dict['cur_ccH_targetHeight']
+        if dict['cur_ccH_targetHeight'] < dict['cam_walk_height']:
+            dist = dict['cam_walk_height'] - dict['cur_ccH_targetHeight']
             
             dict['cur_ccH_targetHeight'] = dict['cur_ccH_targetHeight'] + (dist * multer)
-            if dict['cur_ccH_targetHeight'] > .799:
-                dict['cur_ccH_targetHeight'] = .8
+            if dict['cur_ccH_targetHeight'] > dict['cam_walk_height']:
+                dict['cur_ccH_targetHeight'] = dict['cam_walk_height']
+                
+        cam.min = dict['cam_walk_min'] 
+        cam.max = dict['cam_walk_max']        
         #ccH_targetHeight = .9
     else:  
 
         camCube.localPosition.z += num
     #if camHeightSet not in own:
     if 1 == 1:    
-        #if ccheight != ccH_targetHeight:
         num = ccH_targetHeight - ccheight
-        #camCube.worldPosition.x = controlcube.worldPosition.x
-        #camCube.worldPosition.y = controlcube.worldPosition.y            
-        #camCube.worldPosition.z = controlcube.worldPosition.z + num
     else:
         own['camHeightSet'] = True    
            
     if dict['npause'] == False:
         cont.activate(own.actuators['Camera']) 
-        controlcube['camera'] = 0                
+        controlcube['camera'] = 0    
+    
+    cur_lens = cam1.lens
+    cur_min = cam.min
+    cur_max = cam.max
+    #print(cur_lens)
+    inc = .025
+    if walk == 1:
+        #lens
+        if dict['walk_focal_length'] > cur_lens:
+            new_lens = cur_lens + inc
+        else:
+            new_lens = cur_lens - inc
+        if cur_lens  > (dict['walk_focal_length'] - .1) and cur_lens  < (dict['walk_focal_length'] + .1):
+            new_lens = dict['walk_focal_length']  
+            
+        #distance      
+        inc = .025   
+        if cur_min > (dict['cam_walk_min'] - inc):
+            new_min = cur_min - inc
+        if cur_min < (dict['cam_walk_min'] + inc):
+            new_min = cur_min + inc 
+        if cur_max > (dict['cam_walk_max'] - inc):
+            new_max = cur_min - inc
+        if cur_max < (dict['cam_walk_max'] + inc):
+            new_max = cur_min + inc           
+    else:
+        #lens
+        if dict['focal_length'] > cur_lens:
+            new_lens = cur_lens + inc
+        else:
+            new_lens = cur_lens - inc 
+        if cur_lens  > (dict['focal_length'] - .1) and cur_lens  < (dict['focal_length'] + .1):
+            new_lens = dict['focal_length'] 
+            
+        #distance  
+        inc = .025   
+        if cur_min > (dict['cam_min'] - inc):
+            new_min = cur_min - inc
+        if cur_min < (dict['cam_min'] + inc):
+            new_min = cur_min + inc 
+        if cur_max > (dict['cam_max'] - inc):
+            new_max = cur_min - inc
+        if cur_max < (dict['cam_max'] + inc):
+            new_max = cur_min + inc        
+            
+        
+            
+                                         
+        
+    focallength = new_lens
+    cam1.lens = focallength
+    cam2.lens = focallength
+    cam3.lens = focallength
+    try:
+        cam.min = new_min
+        cam.max = new_max  
+        #print(new_min, new_max)     
+    except:
+        pass    
+    
+                    
 main()

controller2.py

         if grindHit == False:
             cont.deactivate(own.actuators['grindoutRight'])
             cont.deactivate(own.actuators['grindoutLeft'])  
-        if (grindHit == True and jumping == None and sincegrinding > 20 and ground_since > 20)or own['invert_on'] == True and own['last_grind'] == 1:
+        if (LAST_GRIND == True and jumping == None and sincegrinding > 20 and ground_since > 20) or own['invert_on'] == True and LAST_GRIND == 1:
             outloc = 0.022
             bsoutloc = .07
             bsoutvel = .1

walk.py

 try:
     walk_inc = own['walk_inc'] 
 except:
-    own['walk_inc'] = .05
+    own['walk_inc'] = .01
     walk_inc = own['walk_inc']  
     own['walk_jump_timer'] = 0   
 if own['stair_counter'] != 0:
     cont.deactivate(camobj.actuators['camUp'])     
                 
 #----------------
-camera.height = .01 #.9
-camera.min = 1.75
-camera.max = 2.25
+#camera.height = .01 #.9
+#camera.min = 1.75
+#camera.max = 2.25
 lasty = own['lasty']     
 
 def onboard():
     if idle.positive:
         own["walk_idle_frame"] = 0
         cont.deactivate(camobj.actuators['idle_camRight'])  
-        camera.height = .5
+        #camera.height = .5
+        camera.height = dict['cam_idle_height']
     else: 
         if idle_frame == 0:
             own["walk_idle_frame"] = own["framenum"] 
         
         if (diff > 700 and idle_frame != 0 and dropinCol.positive == False and own['walk'] != 0) or own['sit'] == 1:
             cont.activate(camobj.actuators['idle_camRight'])  
-            camera.height = .9   
-            camera.min = 2
-            camera.max = 2.50
+            #camera.height = .9   
+            #camera.min = 2
+            #camera.max = 2.50
             own['walk_idling'] = 1
         else:
             own['walk_idling'] = 0