Changeset 66

Timestamp:

05/18/08 14:24:40 (4 months ago)

Author:

JoeCoder

Message:

Modified nodes to keep track of their children in a self-indexed associative array. This prevents them from having to store their own index in their parent's array.
Made the smoke from the ship in demo1 gradually fade.

Files:

• trunk/bin/yage3d.exe (modified) (previous)
• trunk/src/demo1/gameobj.d (modified) (2 diffs)
• trunk/src/demo1/ship.d (modified) (1 diff)
• trunk/src/demo2/gameobj.d (modified) (2 diffs)
• trunk/src/yage/node/base.d (modified) (5 diffs)
• trunk/src/yage/node/light.d (modified) (1 diff)
• trunk/src/yage/node/node.d (modified) (7 diffs)

trunk/src/demo1/gameobj.d

@@ -31 +31 @@
-class Asteroid : GameObject
-{
+    ModelNode rock;
+    
-    float radius; // cached
-
-    this (BaseNode parent)
-    {   super(parent);
-ModelNode 
+
-        rock.setModel(Resource.model("space/asteroid1.ms3d"));
-    }
@@ -45 +47 @@
-    void setMass(float mass)
-    {   this.mass = mass;
-children[0]
+rock
-        radius = pow(mass, .3333)*.75*4;
-    }

trunk/src/demo1/ship.d

@@ -72 +72 @@
-        {
-            accelerate(Vec3f(0, 0, -speed).rotate(pitch.getTransform()).rotate(getTransform()));
-            Vec3f vel = Vec3f(0, 0, -.8).rotate(pitch.getAbsoluteRotation()).scale(getVelocity().length());
-
-            // Engine smoke
-            SpriteNode puff = new SpriteNode(ship.getScene());
-            puff.setMaterial(Resource.material("fx/smoke.xml"));
-1
+5
-            puff.setScale(Vec3f(.4));
-vel
+getVelocity() - Vec3f(0, 0, -10).rotate(ship.getAbsoluteTransform())
-            puff.setPosition(ship.getAbsolutePosition()+Vec3f(.8, 0, 2.5).rotate(ship.getAbsoluteTransform()));
+            
+            void fade(BaseNode self)
+            {   SpriteNode node = cast(SpriteNode)self;
+                node.setColor(1, 1, 1, node.getLifetime()/5);
+                float scale = std.math.sqrt(5.0f)-std.math.sqrt(node.getLifetime()) + .4;
+                node.setScale(scale);
+                node.setVelocity(node.getVelocity().scale(max(1-delta*ldamp*2, 0.0f)));
+            }
+            puff.onUpdate(&fade);
-
-            puff = new SpriteNode(ship.getScene(), puff);
-            puff.setPosition(ship.getAbsolutePosition()+Vec3f(-.8, 0, 2.5).rotate(ship.getAbsoluteTransform()));
-
+
+
+
+
-            sound.play();
-        }

trunk/src/demo2/gameobj.d

@@ -31 +31 @@
-class Asteroid : GameObject
-{
+    ModelNode rock;
+    
-    float radius; // cached
-
-    this (BaseNode parent)
-    {   super(parent);
-ModelNode 
+
-        rock.setModel(Resource.model("space/asteroid1.ms3d"));
-    }
@@ -45 +47 @@
-    void setMass(float mass)
-    {   this.mass = mass;
-children[0]
+rock
-        radius = pow(mass, .3333)*.75*4;
-    }

trunk/src/yage/node/base.d

@@ -25 +25 @@
-    Scene       scene;          // The Scene that this node belongs to.
-    BaseNode    parent;
-
-
+
-
-    protected void delegate(BaseNode self) on_update = null;    // called on update
@@ -49 +48 @@
-
-    /// Get an array of this Node's children
-
+Node
-    {   return children;
-    }
-
-    /**
-     * Get the index of this Node in its parent's array.
-     * Returns -1 if this node is a Scene.*/
-    int getIndex()
-    {   return index;
-    }
-
@@ -137 +129 @@
-     */ 
-    void update(float delta)
-
-
-
+
-        // This prevents rendering a halfway-updated scenegraph.
-        cache[scene.transform_write].transform = transform;
@@ -148 +138 @@
-            on_update(this);
-
-
-
-
+
-            c.update(delta);
-    }
@@ -174 +162 @@
-        // could this function be called by two different threads on the same Node?
-        // and then the path gets messed up?
-        debug scope(failure) writef("Backtrace xx ",__FILE__,"(",__LINE__,")\n");
-
-        BaseNode path[16384] = void; // surely no one will have a scene graph deeper than this!
-        BaseNode node = this;

trunk/src/yage/node/light.d

@@ -75 +75 @@
-        super.setParent(parent);
-        if (old !is scene)
- && (index != -1)
+
-                old.removeLight(light_index);
-            scene.addLight(this);

trunk/src/yage/node/node.d

@@ -70 +70 @@
-    /// Construct this Node as a child of parent.
-    this(BaseNode parent)
-
-
+
-        scale = Vec3f(1);
-        color = Color("white");
@@ -83 +82 @@
-     * original = This Node will be an exact copy of original.*/
-    this(BaseNode parent, Node original)
-
-
-
+
-
-        visible = original.visible;
@@ -91 +88 @@
-        color = original.color;
-        lifetime = original.lifetime;
+        on_update = original.on_update;
-
-        // From BaseNode
@@ -178 +176 @@
-    /// Remove this Node.  This function should be used instead of delete.
-    void remove()
-
-
-
-
-
-
-
-
+
+
+
-        // this needs to happen because some children (like lights) may need to do more in their remove() function.
-        foreach(Node c; children)
@@ -198 +191 @@
-    in { assert(_parent !is null);
-    }body
-
-
-
-
-
-
-
+
+
+
+
-        parent = _parent;
-
-
+
-        scene = parent.scene;
-        setTransformDirty();
@@ -219 +208 @@
-     * It normally doesn't need to be called manually.*/
-    void update(float delta)
-
-
-
+
-
-        // Move by linear velocity if not zero.
@@ -248 +235 @@
-     * Also perhaps use axis sorting for faster calculations. */
-    void enableLights(ubyte number=8)
-
-
+
-        if (number>Device.getLimit(DEVICE_MAX_LIGHTS))
-            number = Device.getLimit(DEVICE_MAX_LIGHTS);