eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring and compilation fixes

Browse Source
This commit is contained in:
tmj-fstate
2017-11-05 01:58:54 +01:00
parent da11e689ce
commit 714671492b
4 changed files with 65 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scenenode.cpp
View File

@@ -405,7 +405,7 @@ shape_node::merge( shape_node &Shape ) {
m_data.area.center =
interpolate(
m_data.area.center, Shape.m_data.area.center,
static_cast<float>( Shape.m_data.vertices.size() ) / ( Shape.m_data.vertices.size() + m_data.vertices.size() ) );
static_cast<double>( Shape.m_data.vertices.size() ) / ( Shape.m_data.vertices.size() + m_data.vertices.size() ) );
m_data.vertices.insert(
std::end( m_data.vertices ),
std::begin( Shape.m_data.vertices ), std::end( Shape.m_data.vertices ) );
@@ -625,7 +625,7 @@ lines_node::merge( lines_node &Lines ) {
m_data.area.center =
interpolate(
m_data.area.center, Lines.m_data.area.center,
static_cast<float>( Lines.m_data.vertices.size() ) / ( Lines.m_data.vertices.size() + m_data.vertices.size() ) );
static_cast<double>( Lines.m_data.vertices.size() ) / ( Lines.m_data.vertices.size() + m_data.vertices.size() ) );
m_data.vertices.insert(
std::end( m_data.vertices ),
std::begin( Lines.m_data.vertices ), std::end( Lines.m_data.vertices ) );