Another massive update

README.md

@@ -12,8 +12,8 @@ Atrium will provide high level of interactivity, featuring fully dynamic world w
 
 Screenshots
 -----------
-[![Screenshot1](/screenshots/004_thumb.jpg)](/screenshots/004.jpg)
-[![Screenshot1](/screenshots/005_thumb.jpg)](/screenshots/005.jpg)
+[![Screenshot1](/screenshots/006_thumb.jpg)](/screenshots/006.jpg)
+[![Screenshot1](/screenshots/007_thumb.jpg)](/screenshots/007.jpg)
 
 Tech details
 ------------

data/default/shaders/hblur.fp.glsl

@@ -14,7 +14,7 @@ void main(void)
     }
 
     total /= (radius * 2.0 + 1.0);
-    total *= 0.75;
+    total *= 0.8;
 
     gl_FragColor = total;
     //gl_FragColor.a = 1.0;

data/default/shaders/vblur.fp.glsl

@@ -14,7 +14,7 @@ void main(void)
     }
 
     total /= (radius * 2.0 + 1.0);
-    total *= 0.75;
+    total *= 0.8;
 
     gl_FragColor = total;
     //gl_FragColor.a = 0.1;

dgl/core/layer.d

@@ -84,7 +84,7 @@ class Layer: EventListener, Drawable
         if (type == LayerType.Layer2D)
             glOrtho(0, eventManager.windowWidth, 0, eventManager.windowHeight, 0, 1);
         else
-            gluPerspective(60, aspectRatio, 0.1, 400.0);
+            gluPerspective(60, aspectRatio, 0.1, 30.0);
         glMatrixMode(GL_MODELVIEW);
 
         glLoadIdentity();

dgl/graphics/lightmanager.d

@@ -46,6 +46,9 @@ class LightManager: Modifier3D, Drawable
     uint maxLightsPerObject = 4;
     bool lightsVisible = false;
     bool lightsOn = true;
+    bool useUpdateTreshold = false;
+    Vector3f referencePoint = Vector3f(0, 0, 0);
+    float updateThreshold = 400.0f;
 
     Light addLight(Light light)
     {
@@ -66,7 +69,15 @@ class LightManager: Modifier3D, Drawable
     void bind(Object3D obj, double dt)
     {
         glEnable(GL_LIGHTING);
-        apply(obj.getPosition);
+
+        Vector3f objPos = obj.getPosition;
+        if (useUpdateTreshold)
+        {
+            if ((objPos - referencePoint).lengthsqr < updateThreshold)
+                apply(objPos);
+        }
+        else
+            apply(objPos);
     }
 
     void unbind(Object3D obj)

dgl/graphics/material.d

@@ -69,6 +69,7 @@ class Material: Modifier
     bool shadeless = false;
     bool useTextures = true;
     bool additiveBlending = false;
+    bool doubleSided = false;
 
     this()
     {
@@ -107,6 +108,9 @@ class Material: Modifier
             glDisable(GL_LIGHTING);
             glColor4f(diffuseColor.r, diffuseColor.g, diffuseColor.b, diffuseColor.a);
         }
+
+        if (doubleSided)
+            glDisable(GL_CULL_FACE);
 
         if (useTextures)
         foreach(i, tex; textures)
@@ -136,6 +140,9 @@ class Material: Modifier
                 tex.unbind();
             }
         }
+
+        if (doubleSided)
+            glEnable(GL_CULL_FACE);
 
         glActiveTextureARB(GL_TEXTURE0_ARB);
 

dgl/graphics/shadow.d

@@ -141,7 +141,9 @@ class ShadowMap: Drawable
         if (castScene)
         {
             dgl.graphics.material.useDimLight = true;
+            castScene.lighted = false;
             castScene.draw(dt);
+            castScene.lighted = true;
             dgl.graphics.material.useDimLight = false;
         }
 

dgl/graphics/tbcamera.d

@@ -87,9 +87,9 @@ final class TrackballCamera: Modifier, Camera
     this()
     {
         center = Vector3f(0.0f, 0.0f, 0.0f);
-        rotPitch = rotation(Vector3f(1.0f,0.0f,0.0f), 0.0f);
-        rotTurn = rotation(Vector3f(0.0f,1.0f,0.0f), 0.0f);
-        rotRoll = rotation(Vector3f(0.0f,0.0f,1.0f), 0.0f);
+        rotPitch = rotationQuaternion(Vector3f(1.0f,0.0f,0.0f), 0.0f);
+        rotTurn = rotationQuaternion(Vector3f(0.0f,1.0f,0.0f), 0.0f);
+        rotRoll = rotationQuaternion(Vector3f(0.0f,0.0f,1.0f), 0.0f);
         transform = Matrix4x4f.identity;
         distance = 10.0f;
 
@@ -116,13 +116,13 @@ final class TrackballCamera: Modifier, Camera
 
 	    glPushMatrix();
 
-        rotPitch = rotation(Vector3f(1.0f,0.0f,0.0f), degtorad(rotPitchTheta));
-        rotTurn = rotation(Vector3f(0.0f,1.0f,0.0f), degtorad(rotTurnTheta));
-        rotRoll = rotation(Vector3f(0.0f,0.0f,1.0f), degtorad(rotRollTheta));
+        rotPitch = rotationQuaternion(Vector3f(1.0f,0.0f,0.0f), degtorad(rotPitchTheta));
+        rotTurn = rotationQuaternion(Vector3f(0.0f,1.0f,0.0f), degtorad(rotTurnTheta));
+        rotRoll = rotationQuaternion(Vector3f(0.0f,0.0f,1.0f), degtorad(rotRollTheta));
 
         Quaternionf q = rotPitch * rotTurn * rotRoll;
-        Matrix4x4f rotationMatrix = q.toMatrix4x4();
-        transform = translationMatrix(Vector3f(0.0f, 0.0f, -distance)) * rotationMatrix * translationMatrix(center);
+        Matrix4x4f rot = q.toMatrix4x4();
+        transform = translationMatrix(Vector3f(0.0f, 0.0f, -distance)) * rot * translationMatrix(center);
         glLoadMatrixf(transform.arrayof.ptr);
 
         transform.invert();

dgl/graphics/ubershader.d

@@ -82,13 +82,13 @@ private string _uberFragmentShader = q{
     uniform bool bumpEnabled;
     uniform bool parallaxEnabled;
 
-    const float parallaxScale = 0.05;
+    const float parallaxScale = 0.06;
     const float parallaxBias = -0.03;
-    const float lightRadiusSqr = 7.0;
+    const float lightRadiusSqr = 8.5;
     const float wrapFactor = 0.5;
     const float shadowBrightness = 0.3;
     const float shininess = 32.0;
-    const float edgeWidth = 0.3;
+    const float edgeWidth = 0.4;
 
     float texture2DCompare(sampler2D depths, vec2 uv, float compare)
     {
@@ -124,14 +124,22 @@ private string _uberFragmentShader = q{
             gl_FragColor = gl_FrontMaterial.diffuse;
             return;
         }
-
+
+        // Fog term
+        /*
+        const vec4 fogColor = vec4(0.1, 0.2, 0.2, 1.0);
+        float fogDistance = gl_FragCoord.w * 20.0; //1.0 - (gl_FragCoord.z / gl_FragCoord.w) / 4000.0;
+        fogDistance = (fogDistance > 10.0)? fogDistance : 1.0;
+        float fog = clamp(fogDistance, 0.0, 1.0);
+        */
+
         // Shadow term
 	    vec4 shadowCoordinateWdivide = shadowCoord / shadowCoord.w ;
  	    float shadow;
         if (shadowCoord.w > 0.0)
         {
             shadowCoordinateWdivide.z *= 1.005;
-            shadow = texture2DShadowLerp(dgl_Texture7, vec2(512.0, 512.0), 
+            shadow = texture2DShadowLerp(dgl_Texture7, vec2(1024.0, 1024.0), 
                 shadowCoordinateWdivide.st, shadowCoordinateWdivide.z);
         }
         shadow += shadowBrightness;
@@ -162,7 +170,7 @@ private string _uberFragmentShader = q{
         float attenuation; 
         vec3 L;
 
-        vec4 col = vec4(0.05, 0.05, 0.05, 1.0);
+        vec4 col = vec4(0.02, 0.02, 0.02, 1.0);
 
         float diffuse;
         float specular;
@@ -181,7 +189,8 @@ private string _uberFragmentShader = q{
 	        if (gl_LightSource[i].position.w < 2.0)
 	        {
 	            //vec4 Ca = gl_LightSource[i].ambient; 
-	            vec4 Cd = gl_FrontMaterial.diffuse * gl_LightSource[i].diffuse; 
+                vec4 Md = gl_FrontMaterial.diffuse;
+	            vec4 Cd = Md * gl_LightSource[i].diffuse; 
 	            vec4 Cs = gl_FrontMaterial.specular * gl_LightSource[i].specular;  
 
 	            vec3 positionToLightSource = vec3(gl_LightSource[i].position.xyz - position);
@@ -205,19 +214,19 @@ private string _uberFragmentShader = q{
                 // Edge term
                 edgeScale = edgeBias(1.0 - dot(E, N), edgeWidth);
 		        edgeScale = max(0.5, edgeScale * 2.0);
-		        rim = edgeScale * diffuse;
+		        rim = edgeScale * 1.5;
 
                 // Blinn-Phong specular term
                 H = normalize(L + E);
 			    NH = dot(N, H);
 			    specular = max(pow(NH, shininess), 0.0);
 
-	            col += ((Cd*diffuse) + (Cs*specular) + (Cr*rim)) * attenuation;
+	            col += ((Cd*diffuse) + (Cs*specular*3.0) + (Cr*Md*rim)) * attenuation;
 	        }
 	    }
 
-        col *= 0.9;
-	    gl_FragColor = tex * col * shadow + emit;
+        col *= 0.85;
+	    gl_FragColor = (tex * col * shadow + emit); //mix(fogColor, (tex * col * shadow + emit), fog);
 	    gl_FragColor.a = 1.0;
     }
 };

game.conf

@@ -1,6 +1,6 @@
 {
     enableShadows = "1";
-    shadowMapSize = "512";
+    shadowMapSize = "1024";
     enableShaders = "1";
     enableGlow = "1";
 

game/character.d

@@ -38,6 +38,7 @@ class CharacterController: Freeable //, CollisionDispatcher
     Vector3f rotation;
 	float newContactSlopeFactor = 1.0f;
     RigidBody floorBody;
+    bool flyMode = false;
 
     this(PhysicsWorld world, Vector3f pos, float mass, Geometry geom)
     {
@@ -54,6 +55,20 @@ class CharacterController: Freeable //, CollisionDispatcher
 
         //rbody.collisionDispatchers.append(this);
     }
+
+    void enableGravity(bool mode)
+    {
+        flyMode = !mode;
+
+        if (mode)
+        {
+            rbody.gravity = Vector3f(0.0f, -artificalGravity, 0.0f);
+        }
+        else
+        {
+            rbody.gravity = Vector3f(0, 0, 0);
+        }
+    }
 
     void onNewContact(RigidBody b, Contact c)
     {
@@ -74,7 +89,7 @@ class CharacterController: Freeable //, CollisionDispatcher
         Vector3f velocityChange = targetVelocity - rbody.linearVelocity;
         velocityChange.x = clamp(velocityChange.x, -maxVelocityChange, maxVelocityChange);
         velocityChange.z = clamp(velocityChange.z, -maxVelocityChange, maxVelocityChange);
-        if (clampY)
+        if (clampY && !flyMode)
             velocityChange.y = 0;
         else
             velocityChange.y = clamp(velocityChange.y, -maxVelocityChange, maxVelocityChange);
@@ -90,9 +105,16 @@ class CharacterController: Freeable //, CollisionDispatcher
 
         if (onGround && floorBody && speed == 0.0f && jSpeed == 0.0f)
             rbody.linearVelocity = floorBody.linearVelocity;
-
-        speed = 0.0f;
-        jSpeed = 0.0f;
+        if (!flyMode)
+        {
+            speed = 0.0f;
+            jSpeed = 0.0f;
+        }
+        else
+        {
+            speed *= 0.95f;
+            jSpeed *= 0.95f;
+        }
     }
 
     bool checkOnGround()
@@ -124,7 +146,7 @@ class CharacterController: Freeable //, CollisionDispatcher
 
     void jump(float height)
     {
-        if (onGround)
+        if (onGround || flyMode)
         {
             jSpeed = jumpSpeed(height);
             rbody.linearVelocity.y = jSpeed;

game/gravitygun.d

@@ -62,7 +62,7 @@ class GravityGun: Weapon, CollisionDispatcher
         rm.lm.addLight(light);
 
         tesla = New!TeslaEffect(this, glowTexture, light);
-        tesla.start = Vector3f(0, 0.1f, -0.5f);
+        tesla.start = Vector3f(0, 0.075f, -0.5f);
         tesla.width = 5.0f;
         tesla.color = teslaColor;
 
@@ -72,6 +72,15 @@ class GravityGun: Weapon, CollisionDispatcher
         sparks.secondaryColor = Color4f(1.0f, 0.0f, 0.0f, 0.0f);
     }
 
+    override void enableGravity(bool mode)
+    {
+        super.enableGravity(mode);
+        if (mode)
+            sparks.gravityVector = Vector3f(0, -1, 0);
+        else
+            sparks.gravityVector = Vector3f(0, 0, 0);
+    }
+
     override void draw(double dt)
     {
         sparks.draw(dt);
@@ -255,6 +264,7 @@ class GravityGun: Weapon, CollisionDispatcher
             {
                 if (shootedBody)
                 {
+                    sparks.reset(objPos, -camDir);
                     shootedBody.applyImpulse(camDir * 200.0f, shootedBody.position);
                     unsetShootedBody();
                 }

game/physicsentity.d

@@ -6,16 +6,18 @@ import dmech;
 
 class PhysicsEntity: Entity
 {
+    RigidBody rbody;
     ShapeComponent shape;
     Light light;
     bool highlight = false;
 
-    this(Drawable d, ShapeComponent s)
+    this(Drawable d, RigidBody b, ShapeComponent s)
     {
         if (s)
             super(d, s.position);
         else
             super(d, Vector3f(0, 0, 0));
+        rbody = b;
         shape = s;
     }