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

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2019-03-16 01:37:38 +01:00
parent 8a5ca4e05a 8d67338950
commit 4bc90cdd19
35 changed files with 2328 additions and 1740 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 = sn_utils::ld_float32( Input );
radius = ( Preserveradius ?
std::max( radius, sn_utils::ld_float32( Input ) ) :
sn_utils::ld_float32( Input ) );
}