fixing sun again - WIP

assets/grunge_wall.blend

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b325ab502b81ba09e557c6d7bf77e90fa6aea7f8dc0bb35bd60e4659b50c2bf
-size 24080316
+oid sha256:0a8de71602b83655a255c6f6bea738ff2e37c5606c4ebf5f3c796a291f602498
+size 24078236

assets/materials/builtins/skybox0/__init__.py

@@ -13,13 +13,24 @@ class Skybox(ShaderMaterial):
     def init(self):
         self.turbidity = 2.0
         self.reileigh = 2.5
+        self.sunx = 0.0
+        self.suny = 0.0
+        self.sunz = 0.0
 
     def pre_draw(self, shader):
+        dict = bge.logic.globalDict
+        self.sunx = dict['sunx']
+        self.suny = dict['suny']
+        self.sunz = dict['sunz']
+
         shader.setAttrib(bge.logic.SHD_TANGENT)
         shader.setUniformDef('ModelMatrix', bge.logic.MODELMATRIX)
         shader.setUniformDef('cameraPos', bge.logic.CAM_POS)
         shader.setUniform1f('turbidity', self.turbidity)
         shader.setUniform1f('reileigh', self.reileigh)
+        shader.setUniform1f('sunx', self.sunx)
+        shader.setUniform1f('suny', self.suny)
+        shader.setUniform1f('sunz', self.sunz)
         #shader.setUniform1f('luminance', bge.logic.luminance)
         #shader.setUniform1f('bias', bge.logic.bias)
         #shader.setUniform1f('contrast', bge.logic.contrast)

assets/materials/builtins/skybox0/sky.vs

@@ -6,9 +6,11 @@ varying vec3 wPos, pos, viewPos, sunPos;
 uniform mat4 ModelMatrix;
 uniform vec3 cameraPos;
 varying float luminance;
+varying vec3 sunPos4;
+uniform float sunx;
+uniform float suny;
+uniform float sunz;
 
-//varying vec3 sunPos = SUNPOS;
-//varying vec3 sunPos2;
 
 mat3 m3( mat4 m )
 {
@@ -32,7 +34,6 @@ mat3 m3( mat4 m )
 void main()
 {
     wPos = vec3(ModelMatrix * gl_Vertex);
-	//pos = vec3(gl_Vertex);
 
 	wT   = m3(ModelMatrix)*Tangent.xyz;
 	wB   = m3(ModelMatrix)*cross(gl_Normal, Tangent.xyz);
@@ -40,8 +41,8 @@ void main()
 
     //fragPos = ftransform();
     viewPos = wPos - cameraPos.xyz;
-    sunPos = m3(ModelMatrix)*vec3(gl_ModelViewMatrixInverse*gl_LightSource[0].position);
-    //sunPos = m3(ModelMatrix)*vec3(gl_ModelViewMatrixInverse*sunPos2);
+    //sunPos = m3(ModelMatrix)*vec3(gl_ModelViewMatrixInverse*gl_LightSource[0].position);
+    sunPos = vec3(sunx, suny, sunz);
     luminance = gl_Color.r;
     gl_Position = ftransform();
 }

assets/sc.blend

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b435dd53ddd57602bd250de6ea3d4539a372c5ba88df92cf4c33d340e2c8067a
-size 8596056
+oid sha256:734e7c6acf742bffb68713e81cc017e046b71b4c1ed1b37ce8daac1d8030d0b7
+size 8613292

assets/user1.blend

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4b85e1905c6b07299bf4f6e5587182cfa62f2e374018f89ce7f04e2f978245e
-size 2441572
+oid sha256:ac165edb7ce95ce49d6366e08693815c1455fe08591a5499b90b0a2f683c70c9
+size 2449700

assets/user1.blend1

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f892c4bb3b175a0538e44a198e192e5bb8ab85535787ff0d8d5ff04f0221f756
-size 2436556
+oid sha256:d2023b474f2cab2919049873e28728001572b808df806fd60826283f5df59980
+size 2449700

assets/user11.blend

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4cc1e32b2f58cabe808266d2e834e23c2869b35ea6ba8daa7804015a201b39d8
+size 36463320

assets/user12.blend

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:485b07900da509361a609d67509954047504672705269f1afc0253e7d997bdf7
+size 1180316

assets/user3.blend

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6956a1e0d6ca1e03871bb671307217946e9ae1f81cdfca8dba5d62939d272698
+size 36473948

config.ini

@@ -118,8 +118,8 @@ FXAA_SPAN_MAX = 8.0
 #sun settings
 #############
 sun_strength = 1.05
-ambient_strength = 0.35
-sun_rot_x = -0.05
+ambient_strength = 0.5
+sun_rot_x = 0.05
 sun_rot_y = -0.05
 shadow_on = 0
 #------------

scripts/Startup.py

@@ -9,51 +9,6 @@ def main():
     own = cont.owner
     #bge.logic.addScene('Main')
     scenes = bge.logic.getSceneList()
-    #print(scenes)
-#-------
-    #mainDir = GameLogic.expandPath("//")
-    #fileName = mainDir + "Settings.dat" 
-    #with open(fileName) as reading:
-            #data = [line.split()[0] for line in reading]
-            #data = reading.readlines()
-            #print lines[25]
-            #print lines[29]
-            #reading.close() 
-    #resx = int(data[7])
-    #resy = int(data[8]) 
-
-    #trick_string = dict.get('trick_string')                
-#    
-#    fullscreen = bge.render.getFullScreen()
-#    print("fullscreen = ", fullscreen)
-#    #if fullscreen != True:
-#        #bge.render.setFullScreen(True) 
-#    width = render.getWindowWidth()
-#    if width != resx:    
-#        bge.render.setWindowSize(resx, resy) 
-#---------
-    #bge.render.showFramerate
-    #bge.render.showProfile          
-    #dict = bge.logic.globalDict #Get the global dictionary
-    #print(dict)
-    #resx = dict['resx']
-    #resy = dict['resy']
-    #main_scene = [scene for scene in scenes if scene.name=="main"][0]
-#    
-#    for scene in scenes :
-#        if scene.name == 'Hud':
-#            player = scene.objects['player']
-#    print(scene.name)
-
-    #mains = main_scene.objects['Empty']
-    #resx = mains["resx"]
-    #resy = mains["resy"]
-    #print("read res: ", resx, resy)
-#    if not 'render_settings' in own:
-#        print("disable mips")
-#        render.setMipmapping(2)
-#    actu = cont.actuators['myActuator']
-#    cont.deactivate(actu)
 
     for i in scenes:
         if i.name == "main":

scripts/controller2.py

@@ -2606,7 +2606,7 @@ def main():
         except:
             pass 
         psxvel = abs(linVelocity.x)
-        if (lUD > .08 or lUD < -.08) and own['manual_v2'] == False and r_ground.triggered == True and psxvel > .1 and own["Pump"] == False:
+        if ((lUD > .08 or lUD < -.08) and own['manual_v2'] == False and r_ground.triggered == True and psxvel > .1 and own["Pump"] == False) and rUD < turnsens and rUD > -turnsens and rLR < turnsens and rLR > - turnsens:
             if lUD > .08:
                 powerslide()
             else:

shuvit.blend

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89a7916e8f873d5e06151821952acee98d9265847c3e5feb48fb0791cf129373
-size 180306096
+oid sha256:2a72807221c2e589f2152198d8bdd7b10f67153f571f7808b3ae9f456ba4931d
+size 181395308