X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fsnode.cc;h=ffb1d085a33a490e72a0a313a302e56e678ecfe3;hp=101fe62994e3bbbdf5c31b10c31afbd2266e89b3;hb=dbcb9345c23c5c027d808915962843e7db2d14aa;hpb=72b941af07bbf2673539ad4eea073e68d3bcbbfc

diff --git a/src/snode.cc b/src/snode.cc
index 101fe62..ffb1d08 100644
--- a/src/snode.cc
+++ b/src/snode.cc
@@ -2,10 +2,12 @@
 #include <assert.h>
 #include <algorithm>
 #include "snode.h"
+#include "objmesh.h"
 
 SceneNode::SceneNode()
 	: scale(1, 1, 1)
 {
+	scene = 0;
 	parent = 0;
 	name = 0;
 }
@@ -13,6 +15,7 @@ SceneNode::SceneNode()
 SceneNode::SceneNode(Object *obj)
 	: scale(1, 1, 1)
 {
+	scene = 0;
 	parent = 0;
 	name = 0;
 	add_object(obj);
@@ -48,6 +51,7 @@ void SceneNode::add_child(SceneNode *node)
 
 	children.push_back(node);
 	node->parent = this;
+	node->scene = scene;
 }
 
 bool SceneNode::remove_child(SceneNode *node)
@@ -58,6 +62,8 @@ bool SceneNode::remove_child(SceneNode *node)
 	if(it != children.end()) {
 		assert(node->parent == this);
 		node->parent = 0;
+		node->scene = 0;
+		children.erase(it);
 		return true;
 	}
 	return false;
@@ -190,11 +196,37 @@ void SceneNode::update(float dt)
 {
 	update_node(dt);
 
-	for(size_t i=0; i<children.size(); i++) {
+	int num = children.size();
+	for(int i=0; i<num; i++) {
 		children[i]->update(dt);
 	}
 }
 
+void SceneNode::apply_xform()
+{
+	update_node();
+
+	// apply post-order to make sure we don't affect the children xform by our reset
+
+	int nchild = children.size();
+	for(int i=0; i<nchild; i++) {
+		children[i]->apply_xform();
+	}
+
+	int nobj = obj.size();
+	for(int i=0; i<nobj; i++) {
+		if(obj[i]->get_type() == OBJ_MESH) {
+			ObjMesh *om = (ObjMesh*)obj[i];
+			if(om->mesh) {
+				om->mesh->apply_xform(xform);
+			}
+		}
+	}
+
+	pos = Vec3(0, 0, 0);
+	rot = Quat::identity;
+	scale = Vec3(1, 1, 1);
+}
 
 bool SceneNode::intersect(const Ray &ray, HitPoint *hit) const
 {