Changeset 539

Timestamp:

05/16/08 17:10:24 (8 months ago)

Author:

LeoD

Message:

config caching, this was some hard work but it seems pretty useless now :P

Files:

• trunk/run/data/shaders/model-pixel.glsl (modified) (2 diffs)
• trunk/run/data/shaders/shadowmap.glsl (modified) (2 diffs)
• trunk/run/data/shaders/terrain-pixel.glsl (modified) (3 diffs)
• trunk/run/defend.cfg (modified) (1 diff)
• trunk/src/defend/Config.d (modified) (2 diffs)
• trunk/src/defend/Main.d (modified) (2 diffs)
• trunk/src/defend/game/Game.d (modified) (1 diff)
• trunk/src/defend/objects/SceneNode.d (modified) (2 diffs)
• trunk/src/defend/terrain/Terrain.d (modified) (3 diffs)
• trunk/src/gen/util/Config.d (modified) (4 diffs)

trunk/run/data/shaders/model-pixel.glsl

@@ -5 +5 @@
-#   include "shadowmap.glsl"
-
-
+Texture
-
-varying vec4 lightSpacePos;
-#endif
-
+// The model's team color
-uniform vec3 color; 
-
@@ -19 +20 @@
-    gl_FragColor = vec4(tex.rgb * tex.a + color * (1 - tex.a), 1.0) * (light * 2);
-    
-/*
-
+
+Texture
-#else
-    gl_FragColor *= gl_Color;
-*/
+
-}

trunk/run/data/shaders/shadowmap.glsl

@@ -5 +5 @@
-    float shadowMapDistance = texture2D(sampler, shadowMapCoord).r;
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -12 +17 @@
-{
-    vec2 shadowMapCoord = 0.5f * lightSpacePos.xy / lightSpacePos.w + vec2(0.5f, 0.5f);
-
+const 
-    float lightDistance = 0.5f + bias + lightSpacePos.z / lightSpacePos.w * 0.5f;
-
-    float val = 0.1f;
-
-
+const 
+const 
-
-#if SHADOWMAPPING_SAMPLES > 0

trunk/run/data/shaders/terrain-pixel.glsl

@@ -1 @@
-
+Map
-uniform sampler2D texture1;
-uniform sampler2D texture2;
-uniform sampler2D texture3;
-m
+M
-
-#ifdef SHADOWMAPPING
-#   include "shadowmap.glsl"
-
-
+Texture
-
-varying vec4 lightSpacePos;
@@ -18 +18 @@
-    vec2 coord1 = vec2(gl_TexCoord[1]);
-    
-
+Map
-    vec4 c1 = texture2D(texture1, coord1);
-    vec4 c2 = texture2D(texture2, coord1);
-    vec4 c3 = texture2D(texture3, coord1);
-m
+M
-    
-    float inverse = 1.0f / (a.r + a.g + a.b);
@@ -32 +32 @@
-    
-#ifdef SHADOWMAPPING
-
+Texture
-#endif
-}

trunk/run/defend.cfg

@@ -22 +22 @@
-    // port for multiplayer
-    port = 31337
-
+
-[graphics]
-    // shadow mapping
-    shadowmapping = 1
-    
-    [shadowmapping]
+        enable = 1
+        
-        size = 2048
-        samples = 1

trunk/src/defend/Config.d

@@ -2 +2 @@
-
-import tango.io.FilePath;
-//import tango.text.Properties;
-//import tango.util.Convert;
-
-import gen.math.Vector;
@@ -52 +50 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+

trunk/src/defend/Main.d

@@ -78 +78 @@
-        
-        // Load the config
-Config
+typeof(defendConfig)
-    }
-
@@ -244 +244 @@
-
-    // Mirror config settings to shader defines
-("graphics").integer("shadowmapping")
+.graphics.shadowmapping.enable
-    {
-        Shader.define("SHADOWMAPPING");

trunk/src/defend/game/Game.d

@@ -275 +275 @@
-    sceneGraph.addCamera("main", mainCamera, vec3(0, 0, 0.2));
-
-("graphics").integer("shadowmapping")
+.graphics.shadowmapping.enable
-        initShadowMapping();
-

trunk/src/defend/objects/SceneNode.d

@@ -79 +79 @@
-    Mesh mesh;
-    
+    CameraData shadowCamera;
+    
-public:
-    mixin MAllocator;
@@ -119 +121 @@
-            shader.setUniform("lightTexture", 1);
-
-("graphics").integer("shadowmapping")
+.graphics.shadowmapping.enable
-            {
-
-
-
-
-
+
+
+
+
-                shader.setUniform("modelTransform", absoluteModelview);
-                
-
+Camera
-            }
-            

trunk/src/defend/terrain/Terrain.d

@@ -398 +398 @@
-            renderer.setTexture(4, lightmapTexture);
-            
-
+Map
-            shader.setUniform("texture1", 1);
-            shader.setUniform("texture2", 2);
-            shader.setUniform("texture3", 3);
-m
-
-("graphics").integer("shadowmapping")
+M
+
+.graphics.shadowmapping.enable
-            {
-                auto shadow = sceneGraph.getCamera("shadow");
@@ -410 +410 @@
-                
-                renderer.setTexture(5, shadow.framebuffer.texture);
-
+Texture
-
-                shader.setUniform("lightTransform", shadow.core.projection * shadow.core.modelview);
@@ -458 +458 @@
-        renderer.setTexture(4, lightmapTexture);
-        
-
+Map
-        localShader.setUniform("texture1", 1);
-        localShader.setUniform("texture2", 2);
-        localShader.setUniform("texture3", 3);
-m
+M
-
-        foreach(patch; patches)

trunk/src/gen/util/Config.d

@@ -6 +6 @@
-        
-        - structure by indentation (tabs!)
-"section"
+[section]
-        - sections may be nested
-        - a = b defines a variable
@@ -17 +17 @@
-        Example:
-    
-section name
+[name]
-            a = "b"
-            c = 37
-        
-section blubber
+[blubber]
-                foo = vec3(1, 2, 3)
-                blablabla = "blabl\nabla?"
@@ -50 +50 @@
-}
-
-final 
+
-{
-private:
@@ -78 +78 @@
-        return path.dup.pop.toString() ~ "/";
-    }
+}
+
+class CachedConfig(char[] names) : Config
+{
+private:
+    static char[] extractNames(out char[][] types, out char[][] ids)
+    {
+        char[] result;
+        
+        int position;
+    
+        do
+        {
+            char[] name;
+            char[] type;
+            char[] id;
+            
+            while(names[position] == ' ' || names[position] == '\n' || names[position] == '\r')
+                  position++;
+        
+            while(names[position] != ';' && position < names.length)
+                name ~= names[position++];
+
+            position++;
+            
+            {
+                int i;
+                
+                while(name[i] != ' ' && i < name.length)
+                    type ~= name[i++];
+                
+                i++;
+                
+                while(i < name.length)
+                    id ~= name[i++];
+            }
+            
+            types ~= type;
+            ids ~= id;
+        }
+        while(position != names.length);
+        
+        return result;
+    }
+
+    static char[][] splitParts(char[] id)
+    {
+        char[][] result;
+    
+        {
+            char[] part;
+            
+            foreach(c; id)
+            {
+                if(c != '.')
+                    part ~= c;
+                else
+                {
+                    result ~= part;
+                    part = "";
+                }
+            }
+            
+            result ~= part;
+        }
+        
+        return result;
+    }
+
+    static char[] genAssign(char[] type, char[] id)
+    {
+        char[] result = "\t" ~ id ~ " = this";
+        
+        {
+            char[][] parts = splitParts(id);
+            
+            for(uint i = 0; i < parts.length; i++)
+            {
+                auto part = parts[i];
+                
+                if(i == parts.length - 1)
+                {
+                    result ~= ".";
+                
+                    if(type == "int")
+                        result ~= "integer";
+                    else if(type == "string")
+                        result ~= "string";
+                    else
+                        assert(false, "unknown type: " ~ type);
+                }
+                else
+                    result ~= ".child";
+                
+                result ~= "(\"" ~ part ~ "\")";
+            }
+        }   
+        
+        return result ~ ";\n";
+    }
+
+    static char[] genStructs(char[][] types, char[][] ids, char[] level = "", uint depth = 0)
+    {
+        char[] result = "";
+        char[][] done = [];
+        
+        foreach(i, id; ids)
+        {
+            char[][] parts = splitParts(id);
+        
+            if(id.length > level.length && id[0 .. level.length] == level)
+            {
+                if(parts.length == depth + 1)
+                    result ~= types[i] ~ " " ~ parts[$ - 1] ~ ";\n";
+                else
+                {
+                    char[] newLevel = level ~ (depth ? "." : "") ~ parts[depth];
+                    
+                    bool found = false;
+                    
+                    foreach(d; done)
+                    {
+                        if(d == newLevel)
+                        {
+                            found = true;
+                            break;
+                        }
+                    }
+                    
+                    if(found)
+                        continue;
+
+                    done ~= newLevel;
+                    
+                    result ~= "struct _" ~ parts[depth] ~ "\n{\n";
+                    result ~= genStructs(types, ids, newLevel, depth + 1);
+                    result ~= "}\n_" ~ parts[depth] ~ " " ~ parts[depth] ~ ";\n";
+                }
+            }
+        }
+        
+        return result;
+    }
+
+    static char[] genCode()
+    {
+        char[] result = "";
+
+        {
+            char[][] types;
+            char[][] ids;
+            
+            extractNames(types, ids);
+            
+            result ~= genStructs(types, ids);
+            
+            result ~= "this(char[] c)\n{\n\tsuper(c);\n";
+            
+            for(uint i = 0; i < types.length; i++)
+                result ~= genAssign(types[i], ids[i]);
+            
+            result ~= "}";
+        }
+        
+        return result;
+    }
+
+public:
+    //pragma(msg, genCode());
+    mixin(genCode());
-}
-