Minor (mostly) cosmetics changes

Sources/Engine/Base/Base.h

@@ -81,6 +81,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 # define INDEX_T unsigned short
 # define INDEX_GL GL_UNSIGNED_SHORT
 # define FASTMATH __attribute__((pcs("aapcs-vfp")))
+#elif defined(__arm__)
+# define INDEX_T unsigned short
+# define INDEX_GL GL_UNSIGNED_SHORT
+# define FASTMATH
 #else
 # define INDEX_T INDEX
 # define INDEX_GL GL_UNSIGNED_INT

Sources/Engine/Base/Profiling.h

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#if ENGINE_INTERNAL && !defined(PANDORA)
+#if ENGINE_INTERNAL
 
 #include <Engine/Base/CTString.h>
 #include <Engine/Base/Timer.h>
@@ -68,7 +68,7 @@ private:
 class CProfileForm {
 public:
 
-#if ENGINE_INTERNAL && !defined(PANDORA)
+#if ENGINE_INTERNAL
 // implementation:
   CTString pf_strTitle;             // main title of the profiling form
   CTString pf_strAveragingUnits;    // name for averaging units
@@ -118,6 +118,9 @@ public:
   /* Get current value of a counter. */
   INDEX GetCounterCount(INDEX iCounter);
 
+  inline void CountersClear() {pf_apcCounters.Clear();};
+  inline void TimersClear() {pf_aptTimers.Clear();};
+
 #if TIMER_PROFILING
   /* Start a timer. */
   inline void StartTimer(INDEX iTimer) {
@@ -173,11 +176,14 @@ public:
   inline void IncrementCounter(INDEX iCounter, INDEX ctAdd=1) {}
   inline void StartTimer(INDEX iTimer) {};
   inline void StopTimer(INDEX iTimer) {};
+  inline void IncrementAveragingCounter(INDEX ctAdd=1) {};
   inline void IncrementTimerAveragingCounter(INDEX iTimer, INDEX ctAdd=1) {};
   inline void SetCounterName_internal(INDEX iCounter, const CTString &strName) {};
   inline void SetTimerName_internal(INDEX iTimer, const CTString &strName, const CTString &strAveragingName) {};
   #define SETCOUNTERNAME(a,b) SetCounterName_internal(a,"")
   #define SETTIMERNAME(a,b,c) SetTimerName_internal(a,"","")
+  inline void CountersClear() {};
+  inline void TimersClear() {};
 
 #endif // ENGINE_INTERNAL
 

Sources/Engine/Brushes/Brush.h

@@ -482,7 +482,11 @@ public:
 
   // get amount of memory used by this object
   SLONG GetUsedMemory(void);
-}  __attribute__((aligned(64)));
+}
+#ifdef __arm__
+__attribute__((aligned(64)))
+#endif
+;
 
 // get pointer to embedding brush polygon
 inline CBrushPolygon *CBrushShadowMap::GetBrushPolygon(void) {

Sources/Engine/Engine.cpp

@@ -780,20 +780,20 @@ ENGINE_API void SE_EndEngine(void)
 
   // shutdown profilers
   _sfStats.Clear();
-  _pfGfxProfile           .pf_apcCounters.Clear();
-  _pfGfxProfile           .pf_aptTimers  .Clear();
-  _pfModelProfile         .pf_apcCounters.Clear();
-  _pfModelProfile         .pf_aptTimers  .Clear();
-  _pfSoundProfile         .pf_apcCounters.Clear();
-  _pfSoundProfile         .pf_aptTimers  .Clear();
-  _pfNetworkProfile       .pf_apcCounters.Clear();
-  _pfNetworkProfile       .pf_aptTimers  .Clear();
-  _pfRenderProfile        .pf_apcCounters.Clear();
-  _pfRenderProfile        .pf_aptTimers  .Clear();
-  _pfWorldEditingProfile  .pf_apcCounters.Clear();
-  _pfWorldEditingProfile  .pf_aptTimers  .Clear();
-  _pfPhysicsProfile       .pf_apcCounters.Clear();
-  _pfPhysicsProfile       .pf_aptTimers  .Clear();
+  _pfGfxProfile           .CountersClear();
+  _pfGfxProfile           .TimersClear();
+  _pfModelProfile         .CountersClear();
+  _pfModelProfile         .TimersClear();
+  _pfSoundProfile         .CountersClear();
+  _pfSoundProfile         .TimersClear();
+  _pfNetworkProfile       .CountersClear();
+  _pfNetworkProfile       .TimersClear();
+  _pfRenderProfile        .CountersClear();
+  _pfRenderProfile        .TimersClear();
+  _pfWorldEditingProfile  .CountersClear();
+  _pfWorldEditingProfile  .TimersClear();
+  _pfPhysicsProfile       .CountersClear();
+  _pfPhysicsProfile       .TimersClear();
 
   // remove default fonts if needed
   if( _pfdDisplayFont != NULL) { delete _pfdDisplayFont;  _pfdDisplayFont=NULL; }

Sources/Engine/Templates/BSP.cpp

@@ -506,7 +506,7 @@ FLOAT BSPNode<Type, iDimensions>::TestSphere(const Vector<Type, iDimensions> &vS
     }
   }
 }
-#define SPHERE_HACK
+
 #ifdef SPHERE_HACK
 // truncate doubles in d0-d3 to floats in d0-d1
 // destroys d2-d7

Sources/Engine/Templates/BSP_internal.h

@@ -21,6 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 extern FLOAT mth_fCSGEpsilon;
 
+#ifdef __arm__
+#define SPHERE_HACK
+#endif
+
 /*
  * Type used to identify BSP-node locations
  */
@@ -169,7 +173,9 @@ public:
 
   /* Test if a sphere is inside, outside, or intersecting. (Just a trivial rejection test) */
   FLOAT TestSphere(const Vector<Type, iDimensions> &vSphereCenter, Type tSphereRadius) const;
+  #ifdef SPHERE_HACK
   int   TestSphere_hack(const FLOAT *params) const;
+  #endif
   /* Test if a box is inside, outside, or intersecting. (Just a trivial rejection test) */
   FLOAT TestBox(const OBBox<Type> &box) const;
 };