eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 13:29:19 +02:00
Code Issues 121 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-05-19 20:26:01 +02:00
parent a22c5b7361 45e751312a
commit 99a7675b3e
41 changed files with 6565 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simulation.cpp
View File

@@ -723,11 +723,13 @@ state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpa
auto *instance = new TAnimModel( Nodedata );
instance->RaAnglesSet( Scratchpad.location.rotation + rotation ); // dostosowanie do pochylania linii
if( false == instance->Load( &Input, false ) ) {
if( instance->Load( &Input, false ) ) {
instance->location( transform( location, Scratchpad ) );
}
else {
// model nie wczytał się - ignorowanie node
SafeDelete( instance );
}
instance->location( transform( location, Scratchpad ) );
return instance;
}