Merge pull request #1159 from GarageGames/navigation-default-on

Include navigation and testing modules by default

Engine/source/T3D/aiPlayer.cpp

@@ -28,6 +28,8 @@
 #include "T3D/gameBase/moveManager.h"
 #include "console/engineAPI.h"
 
+#include <cfloat>
+
 static U32 sAIPlayerLoSMask = TerrainObjectType | StaticShapeObjectType | StaticObjectType;
 
 IMPLEMENT_CO_NETOBJECT_V1(AIPlayer);

Engine/source/math/test/mMatrixTest.cpp

@@ -30,7 +30,7 @@ extern void default_matF_x_matF_C(const F32 *a, const F32 *b, F32 *mresult);
 extern void mInstallLibrary_ASM();
 
 // If we're x86 and not Mac, then include these. There's probably a better way to do this.
-#if defined(TORQUE_CPU_X86) && !defined(TORQUE_OS_MAC)
+#if defined(WIN32) && defined(TORQUE_CPU_X86)
 extern "C" void Athlon_MatrixF_x_MatrixF(const F32 *matA, const F32 *matB, F32 *result);
 extern "C" void SSE_MatrixF_x_MatrixF(const F32 *matA, const F32 *matB, F32 *result);
 #endif
@@ -55,7 +55,7 @@ TEST(MatrixF, MultiplyImplmentations)
    // C will be the baseline
    default_matF_x_matF_C(m1, m2, mrC);
 
-#if defined(TORQUE_CPU_X86) && !defined(TORQUE_OS_MAC)
+#if defined(WIN32) && defined(TORQUE_CPU_X86)
    // Check the CPU info
    U32 cpuProperties = Platform::SystemInfo.processor.properties;
    bool same;

Engine/source/navigation/navPath.cpp

@@ -37,6 +37,7 @@
 #include "math/mathIO.h"
 
 #include <DetourDebugDraw.h>
+#include <climits>
 
 extern bool gEditingMission;
 

Engine/source/platform/test/netTest.cpp

@@ -25,10 +25,8 @@
 #include "platform/platformNet.h"
 #include "core/util/journal/process.h"
 
-TEST(Net, TCPRequest)
+struct TcpHandle
 {
-   struct handle
-   {
    NetSocket mSocket;
    S32 mDataReceived;
 
@@ -68,14 +66,18 @@ TEST(Net, TCPRequest)
 
       mDataReceived += incomingData.size;
    }
-   } handler;
+};
+
+TEST(Net, TCPRequest)
+{
+   TcpHandle handler;
 
    handler.mSocket = InvalidSocket;
    handler.mDataReceived = 0;
 
    // Hook into the signals.
-   Net::smConnectionNotify. notify(&handler, &handle::notify);
+   Net::smConnectionNotify .notify(&handler, &TcpHandle::notify);
-   Net::smConnectionReceive.notify(&handler, &handle::receive);
+   Net::smConnectionReceive.notify(&handler, &TcpHandle::receive);
 
    // Open a TCP connection to garagegames.com
    handler.mSocket = Net::openConnectTo("72.246.107.193:80");
@@ -83,17 +85,15 @@ TEST(Net, TCPRequest)
    while(Process::processEvents() && (Platform::getRealMilliseconds() < limit) ) {}
 
    // Unhook from the signals.
-   Net::smConnectionNotify. remove(&handler, &handle::notify);
+   Net::smConnectionNotify .remove(&handler, &TcpHandle::notify);
-   Net::smConnectionReceive.remove(&handler, &handle::receive);
+   Net::smConnectionReceive.remove(&handler, &TcpHandle::receive);
 
    EXPECT_GT(handler.mDataReceived, 0)
       << "Didn't get any data back!";
 }
 
-TEST(Net, JournalTCPRequest)
+struct JournalHandle
 {
-   struct handle
-   {
    NetSocket mSocket;
    S32 mDataReceived;
 
@@ -139,8 +139,8 @@ TEST(Net, JournalTCPRequest)
       mDataReceived = 0;
 
       // Hook into the signals.
-         Net::smConnectionNotify. notify(this, &handle::notify);
+      Net::smConnectionNotify .notify(this, &JournalHandle::notify);
-         Net::smConnectionReceive.notify(this, &handle::receive);
+      Net::smConnectionReceive.notify(this, &JournalHandle::receive);
 
       // Open a TCP connection to garagegames.com
       mSocket = Net::openConnectTo("72.246.107.193:80");
@@ -149,13 +149,17 @@ TEST(Net, JournalTCPRequest)
       while(Process::processEvents()) {}
 
       // Unhook from the signals.
-         Net::smConnectionNotify. remove(this, &handle::notify);
+      Net::smConnectionNotify .remove(this, &JournalHandle::notify);
-         Net::smConnectionReceive.remove(this, &handle::receive);
+      Net::smConnectionReceive.remove(this, &JournalHandle::receive);
 
       EXPECT_GT(mDataReceived, 0)
          << "Didn't get any data back!";
    }
-   } handler;
+};
+
+TEST(Net, JournalTCPRequest)
+{
+   JournalHandle handler;
 
    Journal::Record("journalTCP.jrn");
    ASSERT_TRUE(Journal::IsRecording());

Engine/source/platform/test/platformFileIOTest.cpp

@@ -97,8 +97,8 @@ TEST(File, TouchAndTime)
       << "Somehow failed to delete our test file.";
 };
 
-// Mac has no implementations for these functions, so we 'def it out for now.
+// Mac/Linux have no implementations for these functions, so we 'def it out for now.
-#ifndef __MACOSX__
+#ifdef WIN32
 TEST(Platform, Volumes)
 {
    Vector<const char*> names;

Engine/source/platform/test/platformTimerTest.cpp

@@ -44,13 +44,13 @@ TEST(Platform, Sleep)
       << "We didn't sleep at least as long as we requested!";
 };
 
-TEST(TimeManager, BasicAPI)
+struct handle
 {
-   struct handle
-   {
    S32 mElapsedTime;
    S32 mNumberCalls;
 
+   handle() : mElapsedTime(0), mNumberCalls(0) {}
+
    void timeEvent(S32 timeDelta)
    {
       mElapsedTime += timeDelta;
@@ -59,9 +59,11 @@ TEST(TimeManager, BasicAPI)
       if(mElapsedTime >= 1000)
          Process::requestShutdown();
    }
-   } handler;
+};
 
-   handler.mElapsedTime = handler.mNumberCalls = 0;
+TEST(TimeManager, BasicAPI)
+{
+   handle handler;
 
    // Initialize the time manager...
    TimeManager time;

Engine/source/platform/test/profilerTest.cpp

@@ -33,10 +33,10 @@ TEST(Profiler, ProfileStartEnd)
    // Do work.
    if(true)
    {
-      PROFILE_END(ProfileStartEndTest);
+      PROFILE_END();
       return;
    }
-   PROFILE_END(ProfileStartEndTest);
+   PROFILE_END();
 }
 
 TEST(Profiler, ProfileScope)

Tools/CMake/modules/module_navigation.cmake

@@ -21,8 +21,7 @@
 # -----------------------------------------------------------------------------
 
 # Navigation module
-option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
+option(TORQUE_NAVIGATION "Enable Navigation module" ON)
-#mark_as_advanced(TORQUE_NAVIGATION)
 
 if(TORQUE_NAVIGATION)
 	addDef( "TORQUE_NAVIGATION_ENABLED" )

Tools/CMake/modules/module_testing.cmake

@@ -20,7 +20,7 @@
 # IN THE SOFTWARE.
 # -----------------------------------------------------------------------------
 
-option(TORQUE_TESTING "Enable unit test module" OFF)
+option(TORQUE_TESTING "Enable unit test module" ON)
 mark_as_advanced(TORQUE_TESTING)
 
 if(TORQUE_TESTING)

projects.xml

@@ -34,8 +34,8 @@ Here are some examples:
     <module name="razerHydra" path="$RAZERHYDRA_SDK_PATH">Razer Hydra Controller</module>
     <module name="oculusVR" path="$OCULUSVR_SDK_PATH">Oculus VR Devices</module>
     <module name="webDeploy">Web Deployment</module>
-    <module name="navigation">Recast Navigation</module>
+    <module name="navigation" default="1">Recast Navigation</module>
-    <module name="testing">Unit testing</module>
+    <module name="testing" default="1">Unit testing</module>
     <moduleGroup description="Physics Library">
       <module name="" donotwrite="1" default="1">Torque Physics</module>
       <module name="physX">PhysX 2.8 Physics Library</module>