eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 06:49:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into dev

Browse Source
This commit is contained in:
milek7
2017-12-25 18:27:10 +01:00
parent 0aaeda576e 1b5e6aafd1
commit a215a0f8b3
65 changed files with 5288 additions and 4558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scene.cpp
View File

@@ -338,7 +338,7 @@ basic_cell::insert( TAnimModel *Instance ) {
// adds provided sound instance to the cell
void
basic_cell::insert( sound *Sound ) {
basic_cell::insert( sound_source *Sound ) {
m_active = true;
@@ -504,7 +504,7 @@ basic_cell::center( glm::dvec3 Center ) {
// generates renderable version of held non-instanced geometry
void
basic_cell::create_geometry( geometrybank_handle const &Bank ) {
basic_cell::create_geometry( gfx::geometrybank_handle const &Bank ) {
if( false == m_active ) { return; } // nothing to do here
@@ -863,7 +863,7 @@ void
basic_region::serialize( std::string const &Scenariofile ) const {
auto filename { Scenariofile };
if( filename[ 0 ] == '$' ) {
while( filename[ 0 ] == '$' ) {
// trim leading $ char rainsted utility may add to the base name for modified .scn files
filename.erase( 0, 1 );
}
@@ -906,7 +906,7 @@ bool
basic_region::deserialize( std::string const &Scenariofile ) {
auto filename { Scenariofile };
if( filename[ 0 ] == '$' ) {
while( filename[ 0 ] == '$' ) {
// trim leading $ char rainsted utility may add to the base name for modified .scn files
filename.erase( 0, 1 );
}
@@ -1161,19 +1161,7 @@ basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad )
// inserts provided sound in the region
void
basic_region::insert_sound( sound *Sound, scratch_data &Scratchpad ) {
// NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done
auto location = Sound->location();
if( point_inside( location ) ) {
// NOTE: nodes placed outside of region boundaries are discarded
section( location ).insert( Sound );
}
else {
// tracks are guaranteed to hava a name so we can skip the check
ErrorLog( "Bad scenario: sound node placed in location outside region bounds (" + to_string( location ) + ")" );
}
basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) {
}
// inserts provided event launcher in the region