shuvit 6 months ago
parent
commit
9e6889e14a

+ 2
- 2
assets/kits/ramps.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:2d4bed47956024b6fdda2f3f743b37b059ce591e0fbc12d3e86cc26c27f8ba9c
3
-size 149841436
2
+oid sha256:92a772b123cff55f15673ad964a9aa95951a3b8c4171fcb805d6af254ef47235
3
+size 24216420

+ 2
- 2
assets/kits/ramps2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:498ef10ab3bc64f9507ee4dc827291a714a86b7c843418df64f2f7972f9bb337
3
-size 24141316
2
+oid sha256:c6146e4b9d01ad879ad962f9666408f27efac8a3f045411774d2d2f4b30d3627
3
+size 24031756

+ 2
- 2
assets/materials/base_m_kit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:6c37e5a83e1644e6488940c883139290940717fc94f675b34431f2136b41e62f
3
-size 35553820
2
+oid sha256:312fc9b6c449f378acf47324d17c2270e5aabdf5ec22fb02f39beadf330a9607
3
+size 35615708

+ 3
- 0
assets/materials/textures/ramp_trans_n.png View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:98a113465808a42062053be89ad179f1df3ba4fd01c89b7a7aaebbcace35609c
3
+size 11320

+ 3
- 0
assets/materials/textures/ramp_trans_nb.png View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:9b06b6f04c271ea6523932def0c1b0813cb7d1df90b0e2f7ee22cfcd61200502
3
+size 30364

+ 3
- 0
assets/new_ass_test.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:529854bcecbe01c029bf1ba49e97acd152dbc2c2ad7e8b2b32b97d91d025c432
3
+size 848896

+ 3
- 0
assets/ramps.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:f878d18446af524cb524aa77eb95a0fa831fbbf3a4c59a3f4e08e99c9efff9a5
3
+size 22712684

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:967c340fc4b16c93e9c64993595238e08da030575f98ddd663c2f8d6e5810059
3
-size 19833196
2
+oid sha256:7f296d335d33a398eacf246006a46611d5759987055d3862532a79254d8d6029
3
+size 7121688

+ 2
- 2
assets/utils/mini_ramp_gen15new_text.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:028b82f4ecdbd46bdc2961cb4bcaa074664c2aeba68e18c6ea51795c1dc9759b
3
-size 119822052
2
+oid sha256:09b66fd8ac81815a16f9daaf3742ab0397919b0bbf6b9e35988bd1b564d71388
3
+size 140836564

+ 2
- 2
characters/ken.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:e5831d9cf377773a4db5172fb6a16fde1cfc1394fffc1be0adefd45b916fc1fa
3
-size 2869804
2
+oid sha256:6ba3abc8379099161710e43cf63b20f31c2a32532d14cc74a36b91429015198a
3
+size 2870372

+ 11
- 11
config.ini View File

@@ -15,7 +15,7 @@ profile = 0
15 15
 resx = 1920
16 16
 resy = 1080
17 17
 fullscreen_on = 1
18
-music_player = 0
18
+music_player = 1
19 19
 vsync_on = 0
20 20
 #----------
21 21
 
@@ -35,7 +35,7 @@ recorder_on = 1
35 35
 #######
36 36
 cam_height = -0.1
37 37
 focal_length = 12
38
-cam_min = 1.4
38
+cam_min = 2.0
39 39
 cam_max = 4.4
40 40
 cch_targetHeight = 0.3
41 41
 
@@ -91,38 +91,38 @@ wheel4_b = 0.21
91 91
 ###################
92 92
 
93 93
 #brightness / contrast
94
-bc = 1
94
+bc = 0
95 95
 BC_BRIGHTNESS = 1.1
96 96
 BC_CONTRAST = 1.09
97 97
 
98 98
 #HDR
99
-hdr = 1
99
+hdr = 0
100 100
 avgL = 0.8
101 101
 HDRamount = 0.05
102 102
 
103 103
 #Ambient Occlusion
104
-ao = 1
104
+ao = 0
105 105
 onlyAO = 0
106 106
 aowidth = 0.2
107 107
 aoradius = 2.4
108 108
 
109 109
 #Depth of Field
110
-dof_on = 1
110
+dof_on = 0
111 111
 
112 112
 #Bloom
113 113
 bloom_on = 0
114 114
 
115 115
 #FXAA
116
-fxaa = 1
116
+fxaa = 0
117 117
 FXAA_SPAN_MAX = 8.0
118 118
 #-------------------
119 119
 
120 120
 #sun settings
121 121
 #############
122
-sun_strength = 0.95
122
+sun_strength = 1.05
123 123
 ambient_strength = 0.15
124
-sun_rot_x = -0.05
125
-sun_rot_y = -0.05
124
+sun_rot_x = 0.05
125
+sun_rot_y = 0.05
126 126
 shadow_on = 0
127 127
 #------------
128 128
 
@@ -143,7 +143,7 @@ pump_downforce = -0.0
143 143
 man_sens_l = 0.03
144 144
 man_sens_r = 0.08
145 145
 man_sens_side = 0.035
146
-turn_rotation = 0.0175
146
+turn_rotation = 0.025 #0.0175
147 147
 turn_addx = 0.004
148 148
 turn_air_rotation = 0.07
149 149
 grass_mult = 0.98

+ 0
- 38
scripts/StatesGame.py View File

@@ -1,38 +0,0 @@
1
-import utils
2
-import bge
3
-
4
-State = type("State", (object,), {})
5
-#====================================     
6
-class State(object):
7
-    def __init__(self, FSM):
8
-        self.FSM = FSM
9
-        self.timer = 0
10
-        self.startTime = 0
11
-    def Enter(self):
12
-        self.timer = 0
13
-        self.startTime = 0
14
-    def Execute(self):
15
-        print('Executing')
16
-    def Exit(self):
17
-        print('Exiting')
18
-#==================================== 
19
-            
20
-class Example(State):
21
-    def __init__(self,FSM):
22
-        super(Example, self).__init__(FSM)    
23
-        
24
-    def Enter(self):
25
-        self.FSM.stateLife = 1
26
-        super(Example, self).Enter()        
27
-        
28
-    def Execute(self):
29
-        self.FSM.stateLife += 1
30
-        #o = self.FSM.owner
31
-        #g = o.me['game']
32
-        #self.FSM.ToTransition('toNewState')
33
-        #print('cam fsm')
34
-    
35
-    def Exit(self):
36
-        pass
37
-
38
-#====================================  

+ 2
- 2
scripts/camera.py View File

@@ -358,9 +358,9 @@ def main(cont):
358 358
     sound_man.main(cont)
359 359
     
360 360
     if own['life'] % 2 == 1:
361
-        cars.Execute(cont)
361
+        #cars.Execute(cont)
362 362
         own['CamFSM'].Execute()
363
-        walkers.Execute(cont)
363
+        #walkers.Execute(cont)
364 364
     else:
365 365
         pass
366 366
 

+ 18
- 22
scripts/grindV2.py View File

@@ -129,7 +129,8 @@ def main():
129 129
 
130 130
         lineVector = secondary - primary
131 131
         lineVector2 = primary - secondary
132
-        lv_green = Vector(found_green[0][0])
132
+        if found_green != []:
133
+            lv_green = Vector(found_green[0][0])
133 134
             
134 135
         eul = Vector((1, 0, 0)).rotation_difference(lineVector).to_euler()        
135 136
         
@@ -139,17 +140,11 @@ def main():
139 140
         rotation = te.worldOrientation.to_euler()
140 141
         if abs(rotation.z) > 3:
141 142
             te.applyRotation([0, 0, 1.570796*2], True)
142
-        #te.alignAxisToVect(worldY, 1, 1)
143
-        #print(te.worldOrientation, 'world orientation')
144
-
145
-
143
+        
146 144
         xyz = te.localOrientation.to_euler()
147 145
         xyz[0] = math.radians(0)
148 146
         te.localOrientation = xyz.to_matrix()
149 147
 
150
-
151
-
152
-
153 148
         if lineVector == Vector([0.0, 0.0, 0.0]):
154 149
             #print('vector is empty')
155 150
             pass
@@ -157,21 +152,22 @@ def main():
157 152
             te.alignAxisToVect(lineVector, 0, 1)
158 153
         
159 154
         te.worldPosition = primary
160
-        
161
-        local = te.worldOrientation.inverted() * (lv_green - te.worldPosition)
162
-        if local.y < 0:
163
-            #print('flip vector')
164
-            eul = Vector((1, 0, 0)).rotation_difference(lineVector2).to_euler() 
165
-            if lineVector2 == Vector([0.0, 0.0, 0.0]):
166
-                #print('linVector2 is empty')
167
-                pass
155
+
156
+        if found_green != []:
157
+            local = te.worldOrientation.inverted() * (lv_green - te.worldPosition)
158
+            if local.y < 0:
159
+                #print('flip vector')
160
+                eul = Vector((1, 0, 0)).rotation_difference(lineVector2).to_euler() 
161
+                if lineVector2 == Vector([0.0, 0.0, 0.0]):
162
+                    #print('linVector2 is empty')
163
+                    pass
164
+                else:
165
+                    te.alignAxisToVect(lineVector2, 0, 1)
166
+                #print('align2', lineVector2)
167
+                te.worldPosition = secondary
168 168
             else:
169
-                te.alignAxisToVect(lineVector2, 0, 1)
170
-            #print('align2', lineVector2)
171
-            te.worldPosition = secondary
172
-        else:
173
-            #print('align1', lineVector)  
174
-            pass
169
+                #print('align1', lineVector)  
170
+                pass
175 171
 
176 172
 
177 173
         #flip z axis

+ 1
- 1
scripts/scene_init.py View File

@@ -101,7 +101,7 @@ def main():
101 101
             if 'sun' in x:
102 102
                 x.energy = dict['sun_strength']
103 103
         #scene.world.envLightEnergy = dict['ambient_strength']   
104
-        scene.world.envLightEnergy = 0
104
+        #scene.world.envLightEnergy = 0
105 105
         
106 106
         cam['BC_BRIGHTNESS'] = dict['BC_BRIGHTNESS'] 
107 107
         cam['BC_CONTRAST'] = dict['BC_CONTRAST']

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:509fc1002b193babf9301e78c96b23ab02e9c56f3fba19739b5e4ec4982beda1
3
-size 117092972
2
+oid sha256:3e55e2945a5c427472ecf717882c96dd7bf317495661bea9907d5694d73498f0
3
+size 117686772

+ 3
- 0
shuvit_t.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:0ea5fc351cf8bfe6bca856c317d5391c4c5c0e3b5e6373f4acb7838f232b72b5
3
+size 117695636

Loading…
Cancel
Save