BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OctTree is now drawn perfectly

Browse Source
This commit is contained in:
verysecrethero
2015-12-09 10:24:06 +01:00
parent c85bb2eef7
commit 1d0810db10
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tests/OctTreeTestHardCodedTestWorld.h
+22 -22
View File
@@ -128,7 +128,7 @@ private:
//auto min1 = someOctTree.m_Children[i]->m_Box.MinCorner(); //auto min1 = someOctTree.m_Children[i]->m_Box.MinCorner();
//auto max1 = someOctTree.m_Children[i]->m_Box.MaxCorner(); //auto max1 = someOctTree.m_Children[i]->m_Box.MaxCorner();
float boxDrawFactor = 1.05f; float boxDrawFactor = 1.00f;
auto halfSizeFactor = 0.0f; auto halfSizeFactor = 0.0f;
halfSizeFactor = someAABB.HalfSize().x; halfSizeFactor = someAABB.HalfSize().x;
@@ -137,10 +137,10 @@ private:
ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform"); ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform");
transform["Position"] = someAABB.Center()*1.0f; transform["Position"] = someAABB.Center()*1.0f;
transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*halfSizeFactor*boxDrawFactor; transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*halfSizeFactor*boxDrawFactor*2.0f;
ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model"); ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model");
model["Resource"] = "Models/Core/UnitBox.obj"; model["Resource"] = "Models/Core/UnitBox2.obj";
model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f); model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
//just draw the first 8 children - looks nicer in code if i split it this way //just draw the first 8 children - looks nicer in code if i split it this way
@@ -153,10 +153,10 @@ private:
ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform"); ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform");
transform["Position"] = cen1*1.0f; transform["Position"] = cen1*1.0f;
transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*0.97f*halfSizeFactor*boxDrawFactor; transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*halfSizeFactor*boxDrawFactor*2.0f;
ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model"); ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model");
model["Resource"] = "Models/Core/UnitBox.obj"; model["Resource"] = "Models/Core/UnitBox2.obj";
model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f); model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
//OutputDebugStringA((std::to_string(cen1.x) + std::to_string(cen1.y) + std::to_string(cen1.z)).c_str()); //OutputDebugStringA((std::to_string(cen1.x) + std::to_string(cen1.y) + std::to_string(cen1.z)).c_str());
@@ -164,28 +164,28 @@ private:
} }
//then draw the childrens children //then draw the childrens children
//for (size_t j = 0; j < 8; j++) for (size_t j = 0; j < 8; j++)
//{ {
// auto someChild = someOctTree.m_Children[j]; auto someChild = someOctTree.m_Children[j];
// for (size_t i = 0; i < 8; i++) for (size_t i = 0; i < 8; i++)
// { {
// auto cen1 = someChild->m_Children[i]->m_Box.Center(); auto cen1 = someChild->m_Children[i]->m_Box.Center();
// auto boxScale = someChild->m_Children[i]->m_Box.HalfSize(); halfSizeFactor = someChild->m_Children[i]->m_Box.HalfSize().x;
// EntityID entityDummyScene = world.CreateEntity(); EntityID entityDummyScene = world.CreateEntity();
// ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform"); ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform");
// transform["Position"] = cen1*1.0f; transform["Position"] = cen1*1.0f;
// transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*0.97f*boxScale*boxDrawFactor; transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*halfSizeFactor*boxDrawFactor*2.0f;
// ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model"); ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model");
// model["Resource"] = "Models/Core/UnitBox.obj"; model["Resource"] = "Models/Core/UnitBox2.obj";
// model["Color"] = glm::vec4(0.0f, 1.0f, 0.0f, 1.0f); model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
// //OctTreeEntityIdSaved = entityDummyScene; //OctTreeEntityIdSaved = entityDummyScene;
// } }
//} }
} }