Changeset 65
- Timestamp:
- 05/17/08 17:54:53 (5 months ago)
- Files:
-
- trunk/bin/yage3d.exe (modified) (previous)
- trunk/doc/api/yage.resource.ms3dloader.html (added)
- trunk/doc/api/yage.resource.objloader.html (added)
- trunk/src/demo1/gameobj.d (modified) (2 diffs)
- trunk/src/demo1/main.d (modified) (1 diff)
- trunk/src/demo1/ship.d (modified) (1 diff)
- trunk/src/demo2/gameobj.d (modified) (2 diffs)
- trunk/src/demo2/main.d (modified) (1 diff)
- trunk/src/yage/node/camera.d (modified) (1 diff)
- trunk/src/yage/node/node.d (modified) (1 diff)
- trunk/src/yage/system/render.d (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/demo1/gameobj.d
r63 r65 45 45 void setMass(float mass) 46 46 { this.mass = mass; 47 children[0].s cale = Vec3f(pow(mass, .33333)/2);47 children[0].setScale(Vec3f(pow(mass, .33333)/2)); 48 48 radius = pow(mass, .3333)*.75*4; 49 49 } … … 61 61 SpriteNode flare = new SpriteNode(this); 62 62 flare.setMaterial("fx/flare1.xml"); 63 flare.s cale = Vec3f(2);63 flare.setScale(Vec3f(2)); 64 64 65 65 if (timer is null) trunk/src/demo1/main.d
r63 r65 107 107 SpriteNode star = new SpriteNode(l1); 108 108 star.setMaterial("space/star.xml"); 109 star.s cale = Vec3f(2500);109 star.setScale(Vec3f(2500)); 110 110 111 111 // Planet trunk/src/demo1/ship.d
r63 r65 78 78 puff.setMaterial(Resource.material("fx/smoke.xml")); 79 79 puff.setLifetime(1); 80 puff.s cale = Vec3f(.4);80 puff.setScale(Vec3f(.4)); 81 81 //puff.setVelocity(vel); 82 82 puff.setPosition(ship.getAbsolutePosition()+Vec3f(.8, 0, 2.5).rotate(ship.getAbsoluteTransform())); trunk/src/demo2/gameobj.d
r63 r65 45 45 void setMass(float mass) 46 46 { this.mass = mass; 47 children[0].s cale = Vec3f(pow(mass, .33333)/2);47 children[0].setScale(Vec3f(pow(mass, .33333)/2)); 48 48 radius = pow(mass, .3333)*.75*4; 49 49 } … … 61 61 SpriteNode flare = new SpriteNode(this); 62 62 flare.setMaterial("fx/flare1.xml"); 63 flare.s cale = Vec3f(2);63 flare.setScale(Vec3f(2)); 64 64 65 65 if (timer is null) trunk/src/demo2/main.d
r63 r65 202 202 SpriteNode star = new SpriteNode(l1); 203 203 star.setMaterial("space/star.xml"); 204 star.s cale = Vec3f(2500);204 star.setScale(Vec3f(2500)); 205 205 206 206 // Planet trunk/src/yage/node/camera.d
r63 r65 295 295 protected void addNodesToRender(Node node) 296 296 { 297 if (node. visible)297 if (node.getVisible()) 298 298 { node.setOnscreen(true); 299 299 trunk/src/yage/node/node.d
r64 r65 104 104 { // Scene and BaseNode are never children 105 105 // Is there a better way to do this? 106 switch (c. getType())106 switch (c.classinfo.name) 107 107 { case "yage.node.node.Node": new Node(this, cast(Node)c); break; 108 108 case "yage.node.camera.CameraNode": new CameraNode(this, cast(CameraNode)c); break; trunk/src/yage/system/render.d
r63 r65 83 83 glPushMatrix(); 84 84 glMultMatrixf(n.getAbsoluteTransform(true).v.ptr); 85 glScalef(n. scale.x, n.scale.y, n.scale.z);85 glScalef(n.getScale().x, n.getScale().y, n.getScale().z); 86 86 n.enableLights(); 87 87 … … 120 120 foreach (AlphaTriangle at; alpha) 121 121 { foreach (layer; at.matl.getLayers()) 122 { layer.bind(at.node.getLights(), at.node. color);122 { layer.bind(at.node.getLights(), at.node.getColor()); 123 123 glBegin(GL_TRIANGLES); 124 124 … … 201 201 // If not translucent 202 202 if (!sort) 203 { l.bind(node.getLights(), node. color, model);203 { l.bind(node.getLights(), node.getColor(), model); 204 204 draw(); 205 205 l.unbind(); … … 211 211 { AlphaTriangle at; 212 212 for (int i=0; i<3; i++) 213 { at.vertices[i] = abs_transform*v[tri.v[i]].scale(node. scale);213 { at.vertices[i] = abs_transform*v[tri.v[i]].scale(node.getScale()); 214 214 at.texcoords[i] = &t[tri.v[i]]; 215 215 at.normals[i] = &n[tri.v[i]];