EpicSparrow/SparrowEngine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed mesh loading, added sword mesh

Browse Source
This commit is contained in:
Anselme 2016-12-14 22:08:03 +01:00
parent 438a0162e4
commit aeb8ac26ea
4 changed files with 2120 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/bak/sword.mtl Normal file
View File

@ -0,0 +1,9 @@
#
# generated by kHED
#
newmtl steel
d 1.0
map_Kd steel.jpg
newmtl leather
d 1.0
map_Kd leather.jpg

2107
data/bak/sword.obj Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/scene/gibgeneratornode.cpp
View File

@ -38,10 +38,10 @@ void GibGeneratorNode::update()
Gib *g = *it; Gib *g = *it;
if(g->expiration < getEngine().getTime()) if(g->expiration < getEngine().getTime())
{ {
removeChild(g->graphics);
delete g->graphics;
it = m_gibs.erase(it);
getEngine().getPhysics()->removeCollisionObject(g->body); getEngine().getPhysics()->removeCollisionObject(g->body);
removeChild(g->graphics);
it = m_gibs.erase(it);
delete g->graphics;
delete g; delete g;
} }
else else

2
src/scene/graphicalcontainernode.cpp
View File

@ -3,7 +3,7 @@
GraphicalContainerNode::~GraphicalContainerNode() GraphicalContainerNode::~GraphicalContainerNode()
{ {
setVisible(false); // renderer de-indexing setSceneTree(nullptr);
for(GraphicalNode* child : m_children) for(GraphicalNode* child : m_children)
delete child; delete child;
} }