eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 15:59:18 +02:00
Code Issues 123 Wiki Activity

fix gcc pch warning and fix compiling on clang

Browse Source
This commit is contained in:
milek7
2017-11-03 21:22:52 +01:00
parent c7993c6e48
commit 47a8bf668d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scenenode.cpp
View File

@@ -402,7 +402,7 @@ shape_node::merge( shape_node &Shape ) {
m_data.area.center = m_data.area.center =
interpolate( interpolate(
m_data.area.center, Shape.m_data.area.center, 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( m_data.vertices.insert(
std::end( m_data.vertices ), std::end( m_data.vertices ),
std::begin( Shape.m_data.vertices ), std::end( Shape.m_data.vertices ) ); std::begin( Shape.m_data.vertices ), std::end( Shape.m_data.vertices ) );
@@ -622,7 +622,7 @@ lines_node::merge( lines_node &Lines ) {
m_data.area.center = m_data.area.center =
interpolate( interpolate(
m_data.area.center, Lines.m_data.area.center, 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( m_data.vertices.insert(
std::end( m_data.vertices ), std::end( m_data.vertices ),
std::begin( Lines.m_data.vertices ), std::end( Lines.m_data.vertices ) ); std::begin( Lines.m_data.vertices ), std::end( Lines.m_data.vertices ) );

5
stdafx.h
View File

@@ -3,7 +3,8 @@
// are changed infrequently // are changed infrequently
// //
#pragma once #ifndef STDAFX_H
#define STDAFX_H
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <cmath> #include <cmath>
@@ -93,4 +94,4 @@
#define STRINGIZE_DETAIL(x) #x #define STRINGIZE_DETAIL(x) #x
#define STRINGIZE(x) STRINGIZE_DETAIL(x) #define STRINGIZE(x) STRINGIZE_DETAIL(x)
#define glDebug(x) if (GLEW_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x); #define glDebug(x) if (GLEW_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x);
#endif