1+ #pragma once
12#ifndef XRENGINE_ISPATIAL_H_INCLUDED
23#define XRENGINE_ISPATIAL_H_INCLUDED
34
4- // #pragma once
55#include " Common/Platform.hpp"
66#include " xrCore/xrPool.h"
77// #include "xr_collide_defs.h"
@@ -133,10 +133,10 @@ class XRCDB_API SpatialBase : public virtual ISpatial
133133 spatial_updatesector_internal ();
134134 }
135135
136- virtual IGameObject* dcast_GameObject () override { return 0 ; }
137- virtual Feel::Sound* dcast_FeelSound () override { return 0 ; }
138- virtual IRenderable* dcast_Renderable () override { return 0 ; }
139- virtual IRender_Light* dcast_Light () override { return 0 ; }
136+ virtual IGameObject* dcast_GameObject () override { return nullptr ; }
137+ virtual Feel::Sound* dcast_FeelSound () override { return nullptr ; }
138+ virtual IRenderable* dcast_Renderable () override { return nullptr ; }
139+ virtual IRender_Light* dcast_Light () override { return nullptr ; }
140140 SpatialBase (ISpatial_DB* space);
141141 virtual ~SpatialBase ();
142142};
@@ -145,31 +145,28 @@ class XRCDB_API SpatialBase : public virtual ISpatial
145145// class ISpatial_NODE;
146146class ISpatial_NODE
147147{
148- public:
149- typedef _W64 unsigned ptrt;
150-
151148public:
152149 ISpatial_NODE* parent; // parent node for "empty-members" optimization
153150 ISpatial_NODE* children[8 ]; // children nodes
154151 xr_vector<ISpatial*> items; // own items
155- public:
152+
156153 void _init (ISpatial_NODE* _parent);
157154 void _remove (ISpatial* _S);
158155 void _insert (ISpatial* _S);
159- BOOL _empty ()
156+ bool _empty ()
160157 {
161158 return items.empty () &&
162- ( 0 == (ptrt (children[0 ]) | ptrt (children[1 ]) | ptrt (children[2 ]) | ptrt (children[3 ]) | ptrt (children[4 ]) |
163- ptrt (children[5 ]) | ptrt (children[6 ]) | ptrt (children[7 ]) ));
159+ 0 == (intptr_t (children[0 ]) | intptr_t (children[1 ]) | intptr_t (children[2 ]) | intptr_t (children[3 ]) | intptr_t (children[4 ]) |
160+ intptr_t (children[5 ]) | intptr_t (children[6 ]) | intptr_t (children[7 ]));
164161 }
165162};
166163// //////////
167164
168165// template <class T, int granularity>
169- // class poolSS;
166+ // class poolSS;
170167#ifndef DLL_API
171168#define DLL_API XR_IMPORT
172- #endif // #ifndef DLL_API
169+ #endif // #ifndef DLL_API
173170
174171// ////////////////////////////////////////////////////////////////////////
175172class XRCDB_API ISpatial_DB
@@ -260,7 +257,6 @@ class XRCDB_API ISpatial_DB
260257 void update (u32 nodes = 8 );
261258 BOOL verify ();
262259
263- public:
264260 enum
265261 {
266262 O_ONLYFIRST = (1 << 0 ),
0 commit comments