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

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2019-03-16 02:28:36 +01:00
parent a8809f1852 4bc90cdd19
commit 1c1f2f625e
35 changed files with 2358 additions and 1764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scenenode.cpp
View File

@@ -46,10 +46,12 @@ bounding_area::serialize( std::ostream &Output ) const {
// restores content of the struct from provided input stream
void
bounding_area::deserialize( std::istream &Input ) {
bounding_area::deserialize( std::istream &Input, bool const Preserveradius ) {
center = sn_utils::d_dvec3( Input );
radius = std::max(radius, sn_utils::ld_float32( Input ));
radius = ( Preserveradius ?
std::max( radius, sn_utils::ld_float32( Input ) ) :
sn_utils::ld_float32( Input ) );
}