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

Next generation raptor copter

Browse Source
This commit is contained in:
sippeangelo
2015-12-12 03:38:17 +01:00
parent f14c62f3d3
commit 7464facab9
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/Test.xml
+5 -17
View File
@@ -61,7 +61,7 @@
<Components> <Components>
<c:Transform> <c:Transform>
<Position X="0" Y="0"/> <Position X="0" Y="0"/>
<Orientation X="0.0" Y="0" Z="0.0"/> <Orientation X="0.0" Y="0" Z="1.0"/>
</c:Transform> </c:Transform>
<c:Model> <c:Model>
<Resource>Models/Core/UnitRaptor.obj</Resource> <Resource>Models/Core/UnitRaptor.obj</Resource>
@@ -72,8 +72,8 @@
<Entity> <Entity>
<Components> <Components>
<c:Transform> <c:Transform>
<Position X="0" Y="0"/> <Position X="-0.01" Y="0.55"/>
<Orientation X="0" Y="0" Z="0"/> <Orientation X="0" Y="0" Z="-1"/>
</c:Transform> </c:Transform>
<c:RaptorCopter> <c:RaptorCopter>
<Speed>20</Speed> <Speed>20</Speed>
@@ -84,19 +84,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Transform> <c:Transform>
<Position X="0" Y="0.4"/> <Position X="0" Y="0"/>
<Scale X="0.1" Y="0.4" Z="0.1"/>
</c:Transform>
<c:Model>
<Resource>Models/Core/UnitCylinder.obj</Resource>
<Color R="1" G="0.4" B="0.8"/>
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="0.6"/>
<Scale X="1.7" Y="0.03" Z="0.1"/> <Scale X="1.7" Y="0.03" Z="0.1"/>
<Orientation X="0" Y="0" Z="0"/> <Orientation X="0" Y="0" Z="0"/>
</c:Transform> </c:Transform>
@@ -109,7 +97,7 @@
<Entity> <Entity>
<Components> <Components>
<c:Transform> <c:Transform>
<Position X="0" Y="0.6"/> <Position X="0" Y="0"/>
<Scale X="1.7" Y="0.03" Z="0.1"/> <Scale X="1.7" Y="0.03" Z="0.1"/>
<Orientation X="0" Y="1.57" Z="0"/> <Orientation X="0" Y="1.57" Z="0"/>
</c:Transform> </c:Transform>
src/Engine/Rendering/RenderQueueFactory.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ glm::vec3 RenderQueueFactory::AbsolutePosition(World* world, EntityID entity)
do { do {
ComponentWrapper transform = world->GetComponent(entity, "Transform"); ComponentWrapper transform = world->GetComponent(entity, "Transform");
position += AbsoluteOrientation(world, entity) * (glm::vec3)transform["Position"]; position += (glm::vec3)transform["Position"];
entity = world->GetParent(entity); entity = world->GetParent(entity);
} while (entity != 0); } while (entity != 0);