fixed mesh offset of parent / child

underdoeg · Jul 7, 2014 · 222eadb · 222eadb
1 parent ec55dcc
commit 222eadb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/Mesh.cpp b/src/Mesh.cpp
@@ -23,15 +23,15 @@ void Mesh::customDraw() {
 		glCullFace(GL_BACK);
 		glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
 	}
-
-
+
+	//ofDrawBox(0, 0, 0, 1);
+
 	for(Part& part: parts) {
 		if(part.hasTriangles)
 			part.draw();
 	}
 }
 
-
 void Mesh::drawNormals(float length) {
 	bool lightOn = ofGetLightingEnabled();
 	if(lightOn)

diff --git a/src/Object.cpp b/src/Object.cpp
@@ -53,20 +53,21 @@ void Object::draw(Scene* scn) {
 
 	ofNode::transformGL();
 	customDraw();
+	ofNode::restoreTransformGL();
+
 	for(Object* child: children) {
 		child->draw(scn);
 	}
-	ofNode::restoreTransformGL();
 
 	postDraw();
 }
 
 void Object::customDraw() {
 }
 
-void Object::addChild(Object* child) {
+void Object::addChild(Object* child, bool keepGlobalTransform) {
 	child->parent = this;
-	child->setParent(*this, true);
+	child->setParent(*this, keepGlobalTransform);
 	children.push_back(child);
 }
 

diff --git a/src/Object.h b/src/Object.h
@@ -38,7 +38,7 @@ class Object: public ofNode {
 	virtual void customDraw();
 	virtual void postDraw(){};
 
-	void addChild(Object* child);
+	void addChild(Object* child, bool keepGlobalTransform=false);
 	std::vector<Object*> getChildren();
 	Object* getParent();
 	bool hasParent();

diff --git a/src/Parser.h b/src/Parser.h
@@ -772,8 +772,8 @@ class Parser {
 			DNAStructureReader parentReader = reader.readStructure("parent");
 			Object* parent = static_cast<Object*>(parentReader.parse());
 			if(parent != NULL) {
-				parent->addChild(object);
 				object->setTransformMatrix(mat * ofMatrix4x4::getInverseOf(parent->getGlobalTransformMatrix()));
+				parent->addChild(object, false);
 			}
 		}
 

diff --git a/src/Scene.cpp b/src/Scene.cpp
@@ -80,7 +80,6 @@ void Scene::customDraw() {
 
 	//lights
 	if(doLightning) {
-
 		if(lights.size()>0) {
 			ofSetSmoothLighting(true);
 			ofEnableLighting();