Changeset 180

Timestamp:

05/16/10 00:42:49 (2 years ago)

Author:

JoeCoder

Message:

Fixed some build errors in Demo2.
Fixed culling issue with previous build.
Started work on an interface for a new TerrainNode?, but it's very primitive at this point.

Files:

• trunk/res/readme.txt (modified) (1 diff)
• trunk/res/space/fighter.dae (added)
• trunk/res/terrain/islands-height.png (deleted)
• trunk/res/terrain/islands.jpg (deleted)
• trunk/src/demo1/main.d (modified) (1 diff)
• trunk/src/demo1/ship.d (modified) (1 diff)
• trunk/src/demo2/main.d (modified) (4 diffs)
• trunk/src/yage/core/math/matrix.d (modified) (6 diffs)
• trunk/src/yage/core/object2.d (modified) (2 diffs)
• trunk/src/yage/scene/camera.d (modified) (2 diffs)
• trunk/src/yage/scene/model.d (modified) (2 diffs)
• trunk/src/yage/scene/movable.d (modified) (1 diff)
• trunk/src/yage/scene/terrain.d (modified) (2 diffs)
• trunk/src/yage/scene/visible.d (modified) (2 diffs)

trunk/res/readme.txt

@@ -25 +25 @@
-space/asteroid.dae          Eric Poggel, public domain
-space/star.xml              Eric Poggel, public domain
-cifi
+pace
-                            can be used for freeware, shareware, or commercial
-                            games etc.

trunk/src/demo1/main.d

@@ -83 +83 @@
-        planet = scene.addChild(new ModelNode("space/planet.dae"));
-        planet.setSize(Vec3f(60));
+        //planet.setSize(Vec3f(.5));
+        //planet.setScale(Vec3f(.5));
+        //planet.setId("planet");
-        planet.setAngularVelocity(Vec3f(0, -0.01, 0));
-        

trunk/src/demo1/ship.d

@@ -45 +45 @@
-
-        ship = pitch.addChild(new ModelNode());
-cifi
+pace
-        ship.setSize(Vec3f(.25));
-

trunk/src/demo2/main.d

@@ -36 +36 @@
-    // Ship 
-    auto ship = scene.addChild(new ModelNode());
-cifi
+pace
-    ship.setAngularVelocity(Vec3f(0, 1, 0));
-    ship.setScale(Vec3f(1));
@@ -48 +48 @@
-    
-    // Events for main surface.
-    bool grabbed = true;
-    view.onKeyDown = delegate bool(Surface self, int key, int modifier){
-        if (key == SDLK_ESCAPE)
@@ -55 +54 @@
-    };
-    view.onMouseDown = delegate bool(Surface self, byte buttons, Vec2i coordinates, char[] href) {
-
-
-
-
-
+
-        return true;
-    };
@@ -65 +60 @@
-    // Lights
-    auto l1 = scene.addChild(new LightNode());
-3
+20
-
-    // For Testing

trunk/src/yage/core/math/matrix.d

@@ -80 +80 @@
-            test("Inverse 2", Matrix(), c*c.inverse(), c);
-            test("Identity", c, c*Matrix()); // [Below] compared this way because non-rotation values are lost.
-            // These fail on all dmd after 0.177
-            //test("toQuatrn & toAxis", c.toAxis().toMatrix(), c.toQuatrn().toMatrix(), c);
-            //Matrix res = c;
-            //res.set(c.toQuatrn());
-            //test("Set Rotation", res, c);
-
-            foreach (Matrix d; m)
-            {   test("Multiply & Inverse", c, c*d*d.inverse(), d);
-                // These fail on all dmd after 0.177
-                //test("MoveRelative", c, c.moveRelative(d.toAxis()).moveRelative(d.toAxis().negate()), d);
-                //test("Rotate Matrix", c, c.rotate(d).rotate(d.inverse()), d);
-                //test("Rotate Quatrn", c, c.rotate(d.toQuatrn()).rotate(d.toQuatrn().inverse()), d);
-                //test("Rotate Axis", c, c.rotate(d.toAxis()).rotate(d.toAxis().negate()), d);
-
-                // These don't pass for Matrices 7, 8, and 9
-                //test("Rotate Absolute Matrix", c, c.rotateAbsolute(d).rotateAbsolute(d.inverse()), d);
-                //test("Rotate Absolute Quatrn", c, c.rotateAbsolute(d.toQuatrn()).rotateAbsolute(d.toQuatrn().inverse()), d);
-                //test("Rotate Absolute Axis", c, c.rotateAbsolute(d.toAxis()).rotateAbsolute(d.toAxis().inverse()), d);
-            }
-        }
-    }
@@ -169 +150 @@
-        scale.v00 = rx_length;
-        scale.v11 = ry_length;
-     
+
-    }
-    unittest
@@ -199 +180 @@
-    }
-
+    /**
+     * Get the position component of the Matrix as a Vector. */
+    Vec3f getPosition()
+    {   return Vec3f(v[12..15]);        
+    }
+    
+    /**
+     * Extract the scale Vector from the rotation component of the Matrix.
+     * Scale components will always be positive. */
+    Vec3f getScale()
+    {   return Vec3f(
+            Vec3f(v[0..3]).length(),
+            Vec3f(v[4..7]).length(),
+            Vec3f(v[8..11]).length());
+    }
+    unittest
+    {   Matrix m;
+        Vec3f s = Vec3f(1, 2, 4);
+        m.setScalePreservingRotation(s);
+        assert(m.getScale() == s);
+    }
+    
+    
-    /**
-     * Return a copy of this Matrix that has been inverted.
@@ -339 +343 @@
-    }
-
-    /**
-     * Get the position component of the Matrix as a Vector. */
-    Vec3f getPosition()
-    {   return Vec3f(v[12..15]);        
-    }
-    
-    /**
-     * Extract the scale Vector from the rotation component of the Matrix.
-     * Scale components will always be positive. */
-    Vec3f getScale()
-    {           
-        // Matrix position, rotation, scale;
-        //decompose(position, rotation, scale);
-        //return Vec3f(scale[0], scale[5], scale[10]);
-        
-        return Vec3f(
-            Vec3f(v[0..3]).length(),
-            Vec3f(v[4..7]).length(),
-            Vec3f(v[8..11]).length()
-        );
-    }
-    unittest
-    {   Matrix m;
-        Vec3f s = Vec3f(1, 2, 4);
-        m.setScalePreservingRotation(s);
-        assert(m.getScale() == s);
-    }
-    
-    ///
-    float* ptr()
@@ -407 +383 @@
-        Matrix position, rotation, scale;
-        decompose(position, rotation, scale);
-
-
-
-
-
-
-
+
-    }
-    unittest
@@ -603 +573 @@
-     * rotation values already present in the scale part of the Matrix. */
-    void setScalePreservingRotation(Vec3f scale)
-
-
-
-
-
-
-
-
-
+
+
+
+
-        Vec3f rx = Vec3f(v[0..3]);
-        Vec3f ry = Vec3f(v[4..7]);
-        Vec3f rz = Vec3f(v[8..11]);
-        float rx_length = rx.length();
-        float ry_length = ry.length();
-        float rz_length = rz.length();
-        
-        // Divide the basis vectors by their lengths to normalize them.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-

trunk/src/yage/core/object2.d

@@ -6 +6 @@
-module yage.core.object2;
-
-
-
+//
+//
-import yage.core.format;
+import yage.system.log;
-
-debug {
@@ -14 +15 @@
-}
-
-
-
+
+
+
-class YageObject
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**

trunk/src/yage/scene/camera.d

@@ -150 +150 @@
-                position[] = vnode.cache[scene.transform_read].transform_abs.v[12..15];         
-            
-
+
+
-            
-            vnode.onscreen = true;          
@@ -176 +177 @@
-                float dist = sqrt(x*x + y*y+z*z);
-                float pixelHeight = 2*height * -r/dist;
-
-
-
+
-                    vnode.onscreen = false;
-                else // Onscreen and big enough to draw

trunk/src/yage/scene/model.d

@@ -138 +138 @@
-    /// Overridden to cache the radius if changed by the scale.
-    override void setSize(Vec3f s) /// Ditto
-super.setSize(s);
+
-        if (model)
-
+
+
-    }   
-    
@@ -148 +149 @@
-     * the most distant vertex.  There is no setRadius() */
-    float getRadius()
-
+ * getScale().max()
-    }
-

trunk/src/yage/scene/movable.d

@@ -113 +113 @@
-     * Note that scale is inherited by children.  Use get/setSize() of VisibleNode for a similar effect that'snot inherited.*/
-    Vec3f getScale()
-
+
+
-    }
-    void setScale(Vec3f scale) /// ditto;

trunk/src/yage/scene/terrain.d

@@ -6 +6 @@
-
-module yage.scene.terrain;
+
+
+import yage.core.math.vector;
+import yage.resource.geometry;
+import yage.resource.image;
+import yage.resource.material;
+import yage.scene.camera;
+import yage.scene.node;
+import yage.scene.visible;
+
+class TerrainNode : VisibleNode
+{
+    
+    protected Geometry[][] mipmaps;
+    
+    this()
+    {
+    }
+    
+    void setGeometry(T)(Image2!(T, 1) image=null, Vec3f delegate(float r, float s) func=null, Vec2f resolution=Vec2f(256))
+    {
+        mipmaps.length = 3; // determined by resolution
+        mipmaps[0].length = 1;
+        mipmaps[1].length = 4;
+        mipmaps[2].length = 16;
+        
+        assert(image || func);
+    }
+    
+    
+    void setMaterials(Material[] materials, float[][][] amounts)
+    {
+    }
+    
+    /**
+     * 
+     * Params:
+     *     camera = 
+     *     lod = Size of a block of terrain in pixels
+     * Returns:
+     */
+    Geometry[] getVisibleMipmaps(CameraNode camera, float lod=10)
+    {
+        return null;
+    }
+    
+}
+
+
-/+
-This module needs to be brought up to date with the rest of the Yage API before it
-will work.
-
-import tango.util.Convert;
-
-import yage.resource.manager;
@@ -16 +63 @@
-import yage.resource.model;
-import yage.resource.mesh;
-
-
-
+
-import yage.core.math.matrix;
-import yage.core.math.vector;
-import yage.system.system;
-import yage.system.log;

trunk/src/yage/scene/visible.d

@@ -70 +70 @@
-
-    /**
-size but not
+both size and
-     * Classes that inherit VisibleNode must provide this function to specify their radius, or they will not be rendered. */ 
-    float getRadius()
@@ -131 +131 @@
-        
-        foreach (l; all_lights)
-*getScale().max()
+
-            if (l.intensity >= 1/256f) // smallest noticeable brightness for 8-bit per channel color (1/256f).
-                addSorted!(LightNode, float)(lights, l, false, (LightNode a){return a.intensity;}, number );