Compilation changes

Few compile time attempts to speed things up

Swap include guards for pramga once
Change compile options in the cmakeLists for source
generate a pch

small tweaks

Engine/source/CMakeLists.txt

@@ -426,75 +426,52 @@ if (NOT TORQUE_NET_CURL)
 endif()
 
 ################# Executable Generation ###################
+
 if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
-  set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_SHARED)
-
-  # Build the main engine library
-  add_library(TorqueEngine SHARED ${TORQUE_SOURCE_FILES})
-  target_compile_definitions(TorqueEngine PUBLIC ${TORQUE_COMPILE_DEFINITIONS})
-  target_link_libraries(TorqueEngine ${TORQUE_LINK_LIBRARIES} ${TORQUE_LINK_THIRDPARTY})
-  target_include_directories(TorqueEngine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})
-
-  set(TORQUE_SOURCE_FILES "main/main.cpp")
-  set(TORQUE_LINK_LIBRARIES TorqueEngine)
+    set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_SHARED)
+    add_library(TorqueEngine SHARED ${TORQUE_SOURCE_FILES})
+    target_compile_definitions(TorqueEngine PUBLIC ${TORQUE_COMPILE_DEFINITIONS})
+    target_link_libraries(TorqueEngine ${TORQUE_LINK_LIBRARIES} ${TORQUE_LINK_THIRDPARTY})
+    target_include_directories(TorqueEngine PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})
+    set(TORQUE_SOURCE_FILES "main/main.cpp")
+    set(TORQUE_LINK_LIBRARIES TorqueEngine)
 else()
-  if(NOT TORQUE_TESTING)
-    set(TORQUE_SOURCE_FILES "main/main.cpp" ${TORQUE_SOURCE_FILES})
-  endif()
-endif (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
-
-if (APPLE)
-	add_executable(${TORQUE_APP_NAME} MACOSX_BUNDLE 
-    ${TORQUE_SOURCE_FILES})
-
-  target_sources(${TORQUE_APP_NAME} PRIVATE "${TORQUE_APP_ROOT_DIRECTORY}/source/App.xcassets")
-
-  set_source_files_properties( "${TORQUE_APP_ROOT_DIRECTORY}/source/App.xcassets" PROPERTIES 
-        MACOSX_PACKAGE_LOCATION Resources)
-
-	set_target_properties(${TORQUE_APP_NAME} PROPERTIES 
-  MACOSX_BUNDLE true
-  MACOSX_BUNDLE_INFO_PLIST "${TORQUE_APP_ROOT_DIRECTORY}/source/Info.plist"
-  XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.torque3d.${TORQUE_APP_NAME}"
-  INSTALL_RPATH "@executable_path/../Frameworks"
-  XCODE_ATTRIBUTE_SKIP_INSTALL NO
-  BUILD_WITH_INSTALL_RPATH ON
-  XCODE_ATTRIBUTE_INSTALL_PATH "/Applications"
-  XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
-  XCODE_ATTRIBUTE_LINKER_DISPLAYS_MANGLED_NAMES[variant=Debug] YES
-  XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] YES
-  XCODE_ATTRIBUTE_ENABLE_TESTABILITY[variant=Debug] YES
-  XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=Debug] parent
-  XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=RelWithDebInfo] parent
-  XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=Release] resource)
-
-elseif (WIN32)
-	add_executable(${TORQUE_APP_NAME} WIN32 ${TORQUE_SOURCE_FILES})
-
-    set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS /MP /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /fp:precise /fp:except- /GR /Zc:wchar_t-" )
-    if( TORQUE_CPU_X32 )
-       set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "${TORQUE_CXX_FLAGS_COMMON_DEFAULT} /arch:SSE2")
+    if(NOT TORQUE_TESTING)
+        set(TORQUE_SOURCE_FILES "main/main.cpp" ${TORQUE_SOURCE_FILES})
     endif()
-    set(TORQUE_CXX_FLAGS_COMMON ${TORQUE_CXX_FLAGS_COMMON_DEFAULT} CACHE STRING "")
-    mark_as_advanced(TORQUE_CXX_FLAGS_COMMON)
-
-    set(TORQUE_CXX_FLAGS_EXECUTABLES "/wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995" CACHE STRING "")
-    mark_as_advanced(TORQUE_CXX_FLAGS_EXECUTABLES)
-
-    set(TORQUE_CXX_FLAGS "${TORQUE_CXX_FLAGS_COMMON_DEFAULT} ${TORQUE_CXX_FLAGS_EXECUTABLES}" CACHE STRING "")
-    mark_as_advanced(TORQUE_CXX_FLAGS)
-
-	# NOTE: On Windows, /Zc:wchar_t- is necessary otherwise you get unicode errors
-	set_target_properties(${TORQUE_APP_NAME} PROPERTIES COMPILE_FLAGS "${TORQUE_CXX_FLAGS}")
-   if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
-      set_target_properties(TorqueEngine PROPERTIES COMPILE_FLAGS "${TORQUE_CXX_FLAGS_COMMON_DEFAULT}")
-   endif (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
+endif (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
+ 
+if (APPLE)
+    add_executable(${TORQUE_APP_NAME} MACOSX_BUNDLE ${TORQUE_SOURCE_FILES})
+ 
+    target_sources(${TORQUE_APP_NAME} PRIVATE "${TORQUE_APP_ROOT_DIRECTORY}/source/App.xcassets")
+    set_source_files_properties("${TORQUE_APP_ROOT_DIRECTORY}/source/App.xcassets" PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources)
+ 
+    set_target_properties(${TORQUE_APP_NAME} PROPERTIES
+        MACOSX_BUNDLE true
+        MACOSX_BUNDLE_INFO_PLIST "${TORQUE_APP_ROOT_DIRECTORY}/source/Info.plist"
+        XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.torque3d.${TORQUE_APP_NAME}"
+        INSTALL_RPATH "@executable_path/../Frameworks"
+        XCODE_ATTRIBUTE_SKIP_INSTALL NO
+        BUILD_WITH_INSTALL_RPATH ON
+        XCODE_ATTRIBUTE_INSTALL_PATH "/Applications"
+        XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
+        XCODE_ATTRIBUTE_LINKER_DISPLAYS_MANGLED_NAMES[variant=Debug] YES
+        XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] YES
+        XCODE_ATTRIBUTE_ENABLE_TESTABILITY[variant=Debug] YES
+        XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=Debug] parent
+        XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=RelWithDebInfo] parent
+        XCODE_ATTRIBUTE_SDL_FILE_DIR[variant=Release] resource)
+ 
+elseif (WIN32)
+    add_executable(${TORQUE_APP_NAME} WIN32 ${TORQUE_SOURCE_FILES})
 else()
-	add_executable(${TORQUE_APP_NAME} ${TORQUE_SOURCE_FILES})
-
-	# NOTE: On Linux, we set the rpath to ./ so that shared objects next to the executable are used
-	set_target_properties(${TORQUE_APP_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,./")
+    add_executable(${TORQUE_APP_NAME} ${TORQUE_SOURCE_FILES})
+    set_target_properties(${TORQUE_APP_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,./")
 endif()
+ 
+################# Architecture Detection ###################
 
 string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH)
 
@@ -540,7 +517,204 @@ if(IS_ARM)
 endif()
 
 if(MSVC)
-    # Match projectGenerator naming for executables
+    if(IS_X86)
+        target_compile_options(${TORQUE_APP_NAME} PRIVATE
+            /arch:SSE2  # Safe baseline for all configs - dispatch handles ISA upgrades at runtime
+        )
+    endif()
+    if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
+        if(IS_X86)
+            target_compile_options(TorqueEngine PRIVATE
+                /arch:SSE2
+            )
+        endif()
+    endif()
+endif()
+
+################# Compile Flags ###################
+# All flags use target_compile_options with generator expressions so they are
+# per-configuration and never bleed across build types.  The old flat
+# COMPILE_FLAGS string on the target has been removed entirely.
+ 
+# ----- Windows (MSVC) -----
+if (MSVC)
+    # Warnings we suppress engine-wide - all pre-existing
+    set(_TORQUE_MSVC_WARNINGS
+        /wd4018   # signed/unsigned mismatch
+        /wd4100   # unreferenced formal parameter
+        /wd4121   # alignment sensitive to packing
+        /wd4127   # conditional expression is constant
+        /wd4130   # logical op on address of string literal
+        /wd4244   # conversion, possible loss of data
+        /wd4245   # signed/unsigned mismatch on return/init
+        /wd4267   # conversion possible loss of data
+        /wd4389   # signed/unsigned mismatch on comparison
+        /wd4511   # copy constructor could not be generated
+        /wd4512   # assignment operator could not be generated
+        /wd4800   # forcing value to bool
+        /wd4995   # deprecated function
+    )
+ 
+    # Flags that are correct for every configuration
+    set(_TORQUE_MSVC_ALL
+        /MP         # Parallel compilation - single biggest build speed win
+        /FS         # Synchronous PDB writes - required when using /MP
+        /nologo     # Suppress banner
+        /W3         # Warning level 3  (W4 slows compilation noticeably)
+        /WX-        # Warnings are not errors
+        /EHsc       # Standard C++ exception handling only
+        /GR         # RTTI - required for dynamic_cast throughout the engine
+        /GF         # String pooling
+        /Gy         # Function-level linking (dead-code stripping at link time)
+        /Zc:wchar_t-  # Engine-wide ABI requirement
+        /fp:precise   # Consistent FP across the codebase
+        /fp:except-   # No FP exception overhead
+        /bigobj       # >64k sections - consoleObject.h template depth needs this
+        /Qpar-        # Disable auto-paralleliser (causes subtle correctness bugs)
+        /NODEFAULTLIB
+        ${_TORQUE_MSVC_WARNINGS}
+    )
+ 
+    # Debug - prioritise compilation speed and debuggability over all else
+    set(_TORQUE_MSVC_DEBUG
+        /Od     # No optimisation - fastest to compile, cleanest call stacks
+        /Ob0    # No inlining - keeps debugger call stacks honest
+        /RTCs   # Runtime checks: stack corruption + uninitialised variables
+        /GS     # Buffer security checks
+        /Zi     # Embed debug info in .obj - avoids PDB contention with /MP
+        /MDd    # Debug CRT
+    )
+ 
+    # RelWithDebInfo - ship-like speed, but still inspectable in a debugger
+    set(_TORQUE_MSVC_RELWITHDEBINFO
+        /O2     # Maximise speed (implies /Ob2 /Oi /Ot)
+        /Ob1    # Only inline functions explicitly marked - preserves some stack info
+        /Oi     # Intrinsic replacements for common functions
+        /Ot     # Favour fast code over small code
+        /Gw     # Package global data for linker dead-stripping
+        /GS-    # No buffer security checks
+        /Zi     # Debug info in .obj (not a separate PDB) - safer with /MP
+        /MD     # Release CRT
+    )
+ 
+    # Release - maximum runtime performance
+    set(_TORQUE_MSVC_RELEASE
+        /O2     # Maximise speed
+        /Ob2    # Inline any suitable function
+        /Oi     # Intrinsic functions
+        /Ot     # Favour fast code
+        /Oy     # Omit frame pointers (marginal perf gain; hurts external profiling)
+        /Gw     # Package global data
+        /GS-    # No buffer security checks
+        /MD     # Release CRT
+    )
+ 
+    target_compile_options(${TORQUE_APP_NAME} PRIVATE
+        ${_TORQUE_MSVC_ALL}
+        $<$<CONFIG:Debug>:${_TORQUE_MSVC_DEBUG}>
+        $<$<CONFIG:RelWithDebInfo>:${_TORQUE_MSVC_RELWITHDEBINFO}>
+        $<$<CONFIG:Release>:${_TORQUE_MSVC_RELEASE}>
+    )
+ 
+    target_link_options(${TORQUE_APP_NAME} PRIVATE
+        $<$<CONFIG:Debug>:/DEBUG:FASTLINK /INCREMENTAL>
+        $<$<CONFIG:RelWithDebInfo>:/INCREMENTAL /DEBUG:FASTLINK /OPT:REF /OPT:ICF>
+        $<$<CONFIG:Release>:/INCREMENTAL>
+    )
+ 
+    if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
+        target_compile_options(TorqueEngine PRIVATE
+            ${_TORQUE_MSVC_ALL}
+            $<$<CONFIG:Debug>:${_TORQUE_MSVC_DEBUG}>
+            $<$<CONFIG:RelWithDebInfo>:${_TORQUE_MSVC_RELWITHDEBINFO}>
+            $<$<CONFIG:Release>:${_TORQUE_MSVC_RELEASE}>
+        )
+    endif()
+
+endif (MSVC)
+ 
+# ----- GCC / Clang  (Linux and macOS) -----
+if (UNIX)
+    # Flags correct for every configuration on GCC/Clang
+    set(_TORQUE_UNIX_ALL
+        -Wno-unused-parameter
+        -Wno-sign-compare
+        -Wno-reorder
+        -fno-exceptions          # Engine does not use C++ exceptions
+        -fmessage-length=0       # No line-wrapping in compiler messages
+        -pipe                    # Use pipes instead of temp files - faster compilation
+        -Wno-type-limits         # constant conditional expression
+        -Wno-unused-value
+        -Wno-deprecated-declarations
+        -Wno-conversion          # possible loss of data
+        -Wno-sign-conversion
+        -Wno-old-style-cast      # if legacy codebase
+        -Wno-invalid-offsetof    # offsetof non-standard-layout
+    )
+ 
+    # Debug
+    set(_TORQUE_UNIX_DEBUG
+        -O0                      # No optimisation - fastest to compile
+        -g3                      # Maximum debug info (includes macros)
+        -fno-omit-frame-pointer  # Keep frame pointers for sane stack traces
+        -fno-inline              # No inlining - keeps call stacks clean
+    )
+ 
+    # RelWithDebInfo
+    set(_TORQUE_UNIX_RELWITHDEBINFO
+        -O2
+        -g1                      # Minimal debug info - line numbers only
+        -fno-omit-frame-pointer  # Keep frame pointers so profilers work
+    )
+ 
+    # Release
+    set(_TORQUE_UNIX_RELEASE
+        -O3
+        -g0                      # No debug info
+        -fomit-frame-pointer
+        -DNDEBUG
+    )
+ 
+    # LTO in Release only - significantly extends link time so keep it out of Debug/RWD
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        list(APPEND _TORQUE_UNIX_ALL
+            -Wno-shorten-64-to-32
+            -Wno-implicit-int-conversion
+            -Wno-implicit-float-conversion
+            -Wno-nonportable-include-path
+        )
+        set(_TORQUE_UNIX_RELEASE_LINK -flto=thin)  # ThinLTO: much faster than full LTO, near-equivalent results
+    else()
+        set(_TORQUE_UNIX_RELEASE_LINK -flto)
+    endif()
+ 
+    target_compile_options(${TORQUE_APP_NAME} PRIVATE
+        ${_TORQUE_UNIX_ALL}
+        $<$<CONFIG:Debug>:${_TORQUE_UNIX_DEBUG}>
+        $<$<CONFIG:RelWithDebInfo>:${_TORQUE_UNIX_RELWITHDEBINFO}>
+        $<$<CONFIG:Release>:${_TORQUE_UNIX_RELEASE}>
+    )
+ 
+    target_link_options(${TORQUE_APP_NAME} PRIVATE
+        $<$<CONFIG:Release>:${_TORQUE_UNIX_RELEASE_LINK}>
+    )
+ 
+    if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
+        target_compile_options(TorqueEngine PRIVATE
+            ${_TORQUE_UNIX_ALL}
+            $<$<CONFIG:Debug>:${_TORQUE_UNIX_DEBUG}>
+            $<$<CONFIG:RelWithDebInfo>:${_TORQUE_UNIX_RELWITHDEBINFO}>
+            $<$<CONFIG:Release>:${_TORQUE_UNIX_RELEASE}>
+        )
+        target_link_options(TorqueEngine PRIVATE
+            $<$<CONFIG:Release>:${_TORQUE_UNIX_RELEASE_LINK}>
+        )
+    endif()
+endif (UNIX)
+ 
+################# Output Naming (MSVC) ###################
+ 
+if(MSVC)
     set(OUTPUT_CONFIG DEBUG MINSIZEREL RELWITHDEBINFO)
     set(OUTPUT_SUFFIX DEBUG MINSIZE    OPTIMIZEDDEBUG)
     foreach(INDEX RANGE 2)
@@ -552,9 +726,10 @@ if(MSVC)
             set_property(TARGET TorqueEngine PROPERTY ${CONF}_OUTPUT_NAME ${TORQUE_APP_NAME})
         endif (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
     endforeach()
-    # Set Visual Studio startup project
     set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TORQUE_APP_NAME})
 endif()
+ 
+################# Folder Organisation ###################
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 foreach (TORQUE_LIBRARY ${TORQUE_LINK_LIBRARIES})
@@ -564,8 +739,6 @@ foreach (TORQUE_LIBRARY ${TORQUE_LINK_LIBRARIES})
   endif()
   set_target_properties(${TORQUE_LIBRARY} PROPERTIES
   FOLDER "Libraries")
-  # remove warnings from 3rd parties.
-  #target_compile_options(${TORQUE_LIBRARY} PRIVATE "-w")
 endforeach()
 
 target_compile_definitions(${TORQUE_APP_NAME} PUBLIC ${TORQUE_COMPILE_DEFINITIONS})
@@ -589,7 +762,23 @@ target_link_options(${TORQUE_APP_NAME} PUBLIC ${TORQUE_LINK_OPTIONS})
 if (TORQUE_TARGET_PROPERTIES)
    set_target_properties(${TORQUE_APP_NAME} PROPERTIES ${TORQUE_TARGET_PROPERTIES})
 endif (TORQUE_TARGET_PROPERTIES)
-target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})
+target_include_directories(${TORQUE_APP_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})
+
+target_precompile_headers(${TORQUE_APP_NAME} PRIVATE
+    <vector>
+    <string>
+    <map>
+    <memory>
+    <algorithm>
+    <type_traits>
+    <cstring>
+    <cstdlib>
+    <cstdio>
+    <cmath>
+    <cstdint>
+    <cmath>
+    "console/engineObject.h"
+)
 
 if(TORQUE_TESTING)
   if(WIN32)

Engine/source/T3D/AI/AIAimTarget.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _AIAIMTARGET_H_
 #define _AIAIMTARGET_H_
 

Engine/source/T3D/AI/AIController.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _AICONTROLLER_H_
 #define _AICONTROLLER_H_
 #include "navigation/coverPoint.h"

Engine/source/T3D/AI/AICover.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _AICOVER_H_
 #define _AICOVER_H_
 

Engine/source/T3D/AI/AIGoal.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _AIGOAL_H_
 #define _AIGOAL_H_
 

Engine/source/T3D/AI/AIInfo.h

@@ -19,12 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _AIINFO_H_
 #define _AIINFO_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
 
 class AIController;
 struct AIInfo

Engine/source/T3D/AI/AINavigation.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _AINAVIGATION_H_
 #define _AINAVIGATION_H_
 

Engine/source/T3D/Scene.h

@@ -1,17 +1,11 @@
 #pragma once
 #ifndef SCENE_H
 #include "console/engineAPI.h"
-
-#ifndef _NETOBJECT_H_
 #include "sim/netObject.h"
-#endif
 
-#ifndef _ITICKABLE_H_
 #include "core/iTickable.h"
-#endif
-#ifndef _SCENEOBJECT_H_
+
 #include "scene/sceneObject.h"
-#endif
 
 #ifndef GAME_MODE_H
 #include "gameMode.h"

Engine/source/T3D/SceneGroup.h

@@ -1,10 +1,7 @@
 #pragma once
 #ifndef SCENE_GROUP_H
 #define SCENE_GROUP_H
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
 
 class SceneGroup : public SceneObject
 {

Engine/source/T3D/accumulationVolume.h

@@ -19,21 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
-#ifndef _ACCUMULATIONVOLUME_H_
-#define _ACCUMULATIONVOLUME_H_
-
-#ifndef _SCENEPOLYHEDRALSPACE_H_
 #include "scene/scenePolyhedralSpace.h"
-#endif
 
-#ifndef _MSILHOUETTEEXTRACTOR_H_
 #include "math/mSilhouetteExtractor.h"
-#endif
 
-#ifndef _GFXDEVICE_H_
 #include "gfx/gfxDevice.h"
-#endif
 
 /// A volume in space that blocks visibility.
 class AccumulationVolume : public ScenePolyhedralSpace
@@ -97,5 +89,3 @@ class AccumulationVolume : public ScenePolyhedralSpace
       void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints ) override;
       void setTransform( const MatrixF& mat ) override;
 };
-
-#endif // !_AccumulationVolume_H_

Engine/source/T3D/aiClient.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _AICLIENT_H_
 #define _AICLIENT_H_
-
-#ifndef _AICONNECTION_H_
 #include "T3D/aiConnection.h"
-#endif
-#ifndef _TVECTOR_H_
+
 #include "core/util/tVector.h"
-#endif
 
 class ShapeBase;
 class Player;

Engine/source/T3D/aiConnection.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _AICONNECTION_H_
 #define _AICONNECTION_H_
-
-#ifndef _GAMECONNECTION_H_
 #include "T3D/gameBase/gameConnection.h"
-#endif
-#ifndef _MOVEMANAGER_H_
+
 #include "T3D/gameBase/moveManager.h"
-#endif
 
 //-----------------------------------------------------------------------------
 

Engine/source/T3D/aiPlayer.h

@@ -24,13 +24,12 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _AIPLAYER_H_
 #define _AIPLAYER_H_
-
-#ifndef _PLAYER_H_
 #include "T3D/player.h"
-#endif
 
 #ifdef TORQUE_NAVIGATION_ENABLED
 #include "navigation/navPath.h"

Engine/source/T3D/assets/CppAsset.h

@@ -22,22 +22,12 @@
 #ifndef CPP_ASSET_H
 #define CPP_ASSET_H
 #pragma once
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
 //-----------------------------------------------------------------------------
 class CppAsset : public AssetBase

Engine/source/T3D/assets/CubemapAsset.h

@@ -22,22 +22,12 @@
 //-----------------------------------------------------------------------------
 #ifndef CUBEMAP_ASSET_H
 #define CUBEMAP_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
 #include "gui/editor/guiInspectorTypes.h"
 

Engine/source/T3D/assets/ExampleAsset.h

@@ -19,24 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 #ifndef _EXAMPLE_ASSET_H_
 #define _EXAMPLE_ASSET_H_
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
 //-----------------------------------------------------------------------------
 class ExampleAsset : public AssetBase

Engine/source/T3D/assets/GUIAsset.h

@@ -22,22 +22,12 @@
 //-----------------------------------------------------------------------------
 #ifndef GUI_ASSET_H
 #define GUI_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
 #include "gui/editor/guiInspectorTypes.h"
 

Engine/source/T3D/assets/GameObjectAsset.h

@@ -22,25 +22,14 @@
 //-----------------------------------------------------------------------------
 #ifndef GAME_OBJECT_ASSET_H
 #define GAME_OBJECT_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
-#ifndef _GUI_INSPECTOR_TYPES_H_
+
 #include "gui/editor/guiInspectorTypes.h"
-#endif
 
 //-----------------------------------------------------------------------------
 class GameObjectAsset : public AssetBase

Engine/source/T3D/assets/ImageAsset.h

@@ -21,37 +21,24 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 #pragma once
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
-#ifndef _ASSET_DEFINITION_H_
+
 #include "assets/assetDefinition.h"
-#endif
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-#ifndef _ASSET_FIELD_TYPES_H_
+
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
-#ifndef _ASSET_PTR_H_
+
 #include "assets/assetPtr.h"
-#endif 
-#ifndef _GBITMAP_H_
+
 #include "gfx/bitmap/gBitmap.h"
-#endif
-#ifndef _GFXTEXTUREHANDLE_H_
+
 #include "gfx/gfxTextureHandle.h"
-#endif
-#ifndef _NETCONNECTION_H_
+
 #include "sim/netConnection.h"
-#endif
-#ifndef _GFXDEVICE_H_
+
 #include "gfx/gfxDevice.h"
-#endif
-#ifndef _MATTEXTURETARGET_H_
+
 #include "materials/matTextureTarget.h"
-#endif
 
 #include "assetMacroHelpers.h"
 

Engine/source/T3D/assets/ImageAssetInspectors.h

@@ -1,10 +1,8 @@
 #pragma once
 
 #include "ImageAsset.h"
-
-#ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"
-#endif
+
 #include <gui/controls/guiBitmapCtrl.h>
 
 #ifdef TORQUE_TOOLS

Engine/source/T3D/assets/LevelAsset.h

@@ -22,27 +22,16 @@
 //-----------------------------------------------------------------------------
 #ifndef LEVEL_ASSET_H
 #define LEVEL_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
-#include "T3D/assets/ImageAsset.h"
 
-#ifndef _GUI_INSPECTOR_TYPES_H_
+#include "T3D/assets/ImageAsset.h"
 #include "gui/editor/guiInspectorTypes.h"
-#endif
+
 #include <gui/controls/guiBitmapCtrl.h>
 
 //-----------------------------------------------------------------------------

Engine/source/T3D/assets/MaterialAsset.h

@@ -23,34 +23,17 @@
 
 #ifndef MATERIALASSET_H
 #define MATERIALASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
-#ifndef _GFXDEVICE_H_
 #include "gfx/gfxDevice.h"
-#endif
 
-#ifndef _NETCONNECTION_H_
 #include "sim/netConnection.h"
-#endif
-
-#ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"
-#endif
 
 #include "materials/matTextureTarget.h"
 #include "materials/materialDefinition.h"

Engine/source/T3D/assets/ParticleAsset.h

@@ -22,22 +22,12 @@
 //-----------------------------------------------------------------------------
 #ifndef PARTICLE_ASSET_H
 #define PARTICLE_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
 #include "gui/editor/guiInspectorTypes.h"
 

Engine/source/T3D/assets/PostEffectAsset.h

@@ -22,22 +22,12 @@
 //-----------------------------------------------------------------------------
 #ifndef POSTEFFECT_ASSET_H
 #define POSTEFFECT_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
 #include "postFx/postEffect.h"
 

Engine/source/T3D/assets/ScriptAsset.h

@@ -22,26 +22,14 @@
 #ifndef SCRIPT_ASSET_H
 #define SCRIPT_ASSET_H
 #pragma once
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
-#ifndef _ASSET_PTR_H_
 #include "assets/assetPtr.h"
-#endif
 
 //-----------------------------------------------------------------------------
 class ScriptAsset : public AssetBase

Engine/source/T3D/assets/ShapeAnimationAsset.h

@@ -21,32 +21,19 @@
 //-----------------------------------------------------------------------------
 #ifndef SHAPE_ANIMATION_ASSET_H
 #define SHAPE_ANIMATION_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
-#ifndef _TSSHAPE_H_
+
 #include "ts/tsShape.h"
-#endif
+
 #ifndef __RESOURCE_H__
 #include "core/resource.h"
 #endif
-
-#ifndef _ASSET_PTR_H_
 #include "assets/assetPtr.h"
-#endif
 
 #include "assetMacroHelpers.h"
 

Engine/source/T3D/assets/ShapeAsset.h

@@ -21,32 +21,20 @@
 //-----------------------------------------------------------------------------
 #ifndef SHAPE_ASSET_H
 #define SHAPE_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
-#ifndef _TSSHAPE_H_
 #include "ts/tsShape.h"
-#endif
+
 #ifndef __RESOURCE_H__
 #include "core/resource.h"
 #endif
-#ifndef _ASSET_PTR_H_
 #include "assets/assetPtr.h"
-#endif 
+
 #ifndef MATERIALASSET_H
 #include "MaterialAsset.h"
 #endif
@@ -57,9 +45,8 @@
 #ifdef TORQUE_TOOLS
 #include "gui/editor/guiInspectorTypes.h"
 #endif
-#ifndef _BITSTREAM_H_
 #include "core/stream/bitStream.h"
-#endif
+
 #include "assetMacroHelpers.h"
 //-----------------------------------------------------------------------------
 class ShapeAsset : public AssetBase

Engine/source/T3D/assets/SoundAsset.h

@@ -22,59 +22,32 @@
 //-----------------------------------------------------------------------------
 #ifndef SOUND_ASSET_H
 #define SOUND_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
-#ifndef _ASSET_PTR_H_
 #include "assets/assetPtr.h"
-#endif 
 
-#ifndef _BITSTREAM_H_
 #include "core/stream/bitStream.h"
-#endif
 
-#ifndef _SFXRESOURCE_H_
 #include "sfx/sfxResource.h"
-#endif
 
 #ifndef _SFXDESCRIPTION_H_
 #include "sfx/sfxDescription.h"
 #endif // !_SFXDESCRIPTION_H_
-
-
-#ifndef _SFXTRACK_H_
 #include "sfx/sfxTrack.h"
-#endif
 
 #ifndef _SFXPROFILE_H_
 #include "sfx/sfxProfile.h"
 #endif // !_SFXPROFILE_H_
-
-#ifndef _RESOURCEMANAGER_H_
 #include "core/resourceManager.h"
-#endif
 
-#ifndef _SFXPLAYLIST_H_
 #include "sfx/sfxPlayList.h"
-#endif
 
-#ifndef _SFXTYPES_H_
 #include "sfx/sfxTypes.h"
-#endif
 
 #include "assetMacroHelpers.h"
 class SFXResource;

Engine/source/T3D/assets/SoundAssetInspectors.h

@@ -1,10 +1,7 @@
 #pragma once
 
 #include "SoundAsset.h"
-
-#ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"
-#endif
 
 #ifdef TORQUE_TOOLS
 class GuiInspectorTypeSoundAssetPtr : public GuiInspectorTypeFileName

Engine/source/T3D/assets/SubSceneAsset.h

@@ -5,14 +5,9 @@
 #ifndef LEVEL_ASSET_H
 #include "LevelAsset.h"
 #endif
-
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"
-#endif
 
 class SubSceneAsset : public LevelAsset
 {

Engine/source/T3D/assets/TerrainAsset.h

@@ -22,30 +22,15 @@
 #pragma once
 #ifndef TERRAINASSET_H
 #define TERRAINASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
-#ifndef _GFXDEVICE_H_
 #include "gfx/gfxDevice.h"
-#endif
-
-#ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"
-#endif
 
 //#include "terrain/terrData.h"
 #include "assets/assetPtr.h"

Engine/source/T3D/assets/TerrainMaterialAsset.h

@@ -22,38 +22,19 @@
 #pragma once
 #ifndef TERRAINMATERIALASSET_H
 #define TERRAINMATERIALASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
-#ifndef _GFXDEVICE_H_
 #include "gfx/gfxDevice.h"
-#endif
-
-#ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"
-#endif
 
-#ifndef _TERRMATERIAL_H_
 #include "terrain/terrMaterial.h"
-#endif
 
-#ifndef _MATERIALDEFINITION_H_
 #include "materials/materialDefinition.h"
-#endif
 
 //-----------------------------------------------------------------------------
 class TerrainMaterialAsset : public AssetBase

Engine/source/T3D/assets/stateMachineAsset.h

@@ -22,22 +22,12 @@
 //-----------------------------------------------------------------------------
 #ifndef STATE_MACHINE_ASSET_H
 #define STATE_MACHINE_ASSET_H
-
-#ifndef _ASSET_BASE_H_
 #include "assets/assetBase.h"
-#endif
 
-#ifndef _ASSET_DEFINITION_H_
 #include "assets/assetDefinition.h"
-#endif
 
-#ifndef _STRINGUNIT_H_
-#include "string/stringUnit.h"
-#endif
-
-#ifndef _ASSET_FIELD_TYPES_H_
+#include "core/strings/stringUnit.h"
 #include "assets/assetFieldTypes.h"
-#endif
 
 #include "gui/editor/guiInspectorTypes.h"
 

Engine/source/T3D/camera.h

@@ -24,18 +24,13 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _CAMERA_H_
 #define _CAMERA_H_
-
-#ifndef _SHAPEBASE_H_
 #include "T3D/shapeBase.h"
-#endif
-
-#ifndef _DYNAMIC_CONSOLETYPES_H_
 #include "console/dynamicTypes.h"
-#endif
-
 
 class CameraData: public ShapeBaseData 
 {

Engine/source/T3D/cameraSpline.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 
 #ifndef _CAMERASPLINE_H_

Engine/source/T3D/containerQuery.h

@@ -19,19 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CONTAINERQUERY_H_
 #define _CONTAINERQUERY_H_
-
-#ifndef _MPOINT3_H_
 #include "math/mPoint3.h"
-#endif
-#ifndef _STRINGTABLE_H_
+
 #include "core/stringTable.h"
-#endif
-#ifndef _MBOX_H_
+
 #include "math/mBox.h"
-#endif
 
 class SceneObject;
 class WaterObject;

Engine/source/T3D/convexShape.h

@@ -19,22 +19,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CONVEXSHAPE_H_
 #define _CONVEXSHAPE_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
+
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _CONVEX_H_
+
 #include "collision/convex.h"
-#endif
 
 #include "T3D/assets/MaterialAsset.h"
 

Engine/source/T3D/debris.h

@@ -24,6 +24,8 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _DEBRIS_H_
 #define _DEBRIS_H_
@@ -31,9 +33,7 @@
 #ifndef __RESOURCE_H__
 #include "core/resource.h"
 #endif
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
 
 #include "T3D/assets/ShapeAsset.h"
 

Engine/source/T3D/decal/decalData.h

@@ -19,22 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DECALDATA_H_
 #define _DECALDATA_H_
-
-#ifndef _SIMDATABLOCK_H_
 #include "console/simDatablock.h"
-#endif
-#ifndef _MATERIALDEFINITION_H_
+
 #include "materials/materialDefinition.h"
-#endif
-#ifndef _MRECT_H_
+
 #include "math/mRect.h"
-#endif
-#ifndef _DYNAMIC_CONSOLETYPES_H_
 #include "console/dynamicTypes.h"
-#endif
 
 #include "T3D/assets/MaterialAsset.h"
 

Engine/source/T3D/decal/decalDataFile.h

@@ -19,22 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DECALDATAFILE_H_
 #define _DECALDATAFILE_H_
-
-#ifndef _DATACHUNKER_H_
 #include "core/dataChunker.h"
-#endif
 
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
-#ifndef _DECALSPHERE_H_
 #include "T3D/decal/decalSphere.h"
-#endif
-
 
 class Stream;
 class DecalData;

Engine/source/T3D/decal/decalInstance.h

@@ -19,17 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DECALINSTANCE_H_
 #define _DECALINSTANCE_H_
-
-#ifndef _GFXVERTEXBUFFER_H_
 #include "gfx/gfxVertexBuffer.h"
-#endif
 
-#ifndef _DECALDATA_H_
 #include "T3D/decal/decalData.h"
-#endif
 
 struct DecalVertex;
 class SceneRenderState;

Engine/source/T3D/decal/decalManager.h

@@ -19,50 +19,30 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DECALMANAGER_H_
 #define _DECALMANAGER_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-
-#ifndef _MATHUTIL_FRUSTUM_H_
 #include "math/util/frustum.h"
-#endif
 
-#ifndef _GFXPRIMITIVEBUFFER_H_
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
 
-#ifndef _GFXDEVICE_H_
 #include "gfx/gfxDevice.h"
-#endif
 
-#ifndef _CLIPPEDPOLYLIST_H_
 #include "collision/clippedPolyList.h"
-#endif
 
-#ifndef _DECALDATAFILE_H_
 #include "decalDataFile.h"
-#endif
 
 #ifndef __RESOURCE_H__
 #include "core/resource.h"
 #endif
-
-#ifndef _DECALINSTANCE_H_
 #include "decalInstance.h"
-#endif
 
-#ifndef _TSIGNAL_H_
 #include "core/util/tSignal.h"
-#endif
 
-#ifndef _DATACHUNKER_H_
 #include "core/dataChunker.h"
-#endif
-
 
 //#define DECALMANAGER_DEBUG
 

Engine/source/T3D/decal/decalSphere.h

@@ -19,18 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DECALSPHERE_H_
 #define _DECALSPHERE_H_
-
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
-#ifndef _MSPHERE_H_
 #include "math/mSphere.h"
-#endif
-
 
 class DecalInstance;
 class SceneZoneSpaceManager;

Engine/source/T3D/examples/renderMeshExample.h

@@ -19,19 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RENDERMESHEXAMPLE_H_
 #define _RENDERMESHEXAMPLE_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
+
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
 
 #include "T3D/assets/MaterialAsset.h"
 

Engine/source/T3D/examples/renderObjectExample.h

@@ -19,22 +19,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RENDEROBJECTEXAMPLE_H_
 #define _RENDEROBJECTEXAMPLE_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _GFXSTATEBLOCK_H_
+
 #include "gfx/gfxStateBlock.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
+
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
 
 class BaseMatInstance;
 

Engine/source/T3D/examples/renderShapeExample.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RENDERSHAPEEXAMPLE_H_
 #define _RENDERSHAPEEXAMPLE_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _TSSHAPEINSTANCE_H_
+
 #include "ts/tsShapeInstance.h"
-#endif
 
 #include "T3D/assets/ShapeAsset.h"
 

Engine/source/T3D/fx/cameraFXMgr.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CAMERAFXMGR_H_
 #define _CAMERAFXMGR_H_
@@ -26,12 +28,9 @@
 #ifndef _TORQUE_LIST_
 #include "core/util/tList.h"
 #endif
-#ifndef _MPOINT3_H_
 #include "math/mPoint3.h"
-#endif
-#ifndef _MMATRIX_H_
+
 #include "math/mMatrix.h"
-#endif
 
 //**************************************************************************
 // Abstract camera effect template

Engine/source/T3D/fx/explosion.h

@@ -24,22 +24,19 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _EXPLOSION_H_
 #define _EXPLOSION_H_
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
-#ifndef _TSSHAPE_H_
+
 #include "ts/tsShape.h"
-#endif
+
 #ifndef __RESOURCE_H__
 #include "core/resource.h"
 #endif
-#ifndef _LIGHTINFO_H_
 #include "lighting/lightInfo.h"
-#endif
 
 #include "T3D/assets/ShapeAsset.h"
 #include "T3D/assets/SoundAsset.h"

Engine/source/T3D/fx/fxFoliageReplicator.h

@@ -24,28 +24,21 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _FOLIAGEREPLICATOR_H_
 #define _FOLIAGEREPLICATOR_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _GFXTEXTUREHANDLE_H_
+
 #include "gfx/gfxTextureHandle.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _GBITMAP_H_
+
 #include "gfx/bitmap/gBitmap.h"
-#endif
-#ifndef _RENDERPASSMANAGER_H_
+
 #include "renderInstance/renderPassManager.h"
-#endif
-#ifndef _MATHUTIL_FRUSTUM_H_
 #include "math/util/frustum.h"
-#endif
 
 #pragma warning( push, 4 )
 

Engine/source/T3D/fx/fxShapeReplicator.h

@@ -19,19 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SHAPEREPLICATOR_H_
 #define _SHAPEREPLICATOR_H_
-
-#ifndef _TSSTATIC_H_
 #include "T3D/tsStatic.h"
-#endif
-#ifndef _TSSHAPEINSTANCE_H_
+
 #include "ts/tsShapeInstance.h"
-#endif
-#ifndef _RENDERPASSMANAGER_H_
+
 #include "renderInstance/renderPassManager.h"
-#endif
 
 #define AREA_ANIMATION_ARC         (1.0f / 360.0f)
 

Engine/source/T3D/fx/groundCover.h

@@ -19,31 +19,23 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GROUNDCOVER_H_
 #define _GROUNDCOVER_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _MATHUTIL_FRUSTUM_H_
 #include "math/util/frustum.h"
-#endif
-#ifndef _GFXTEXTUREHANDLE_H_
+
 #include "gfx/gfxTextureHandle.h"
-#endif
-#ifndef _GFX_GFXPRIMITIVEBUFFER_H_
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _RENDERPASSMANAGER_H_
+
 #include "renderInstance/renderPassManager.h"
-#endif
-#ifndef _MATTEXTURETARGET_H_
+
 #include "materials/matTextureTarget.h"
-#endif
-#ifndef _SHADERFEATURE_H_
+
 #include "shaderGen/shaderFeature.h"
-#endif
+
 #ifndef SHAPE_ASSET_H
 #include "T3D/assets/ShapeAsset.h"
 #endif

Engine/source/T3D/fx/lightning.h

@@ -19,25 +19,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _LIGHTNING_H_
 #define _LIGHTNING_H_
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
+
 #ifndef _TORQUE_LIST_
 #include "core/util/tList.h"
 #endif
-#ifndef _COLOR_H_
 #include "core/color.h"
-#endif
-#ifndef _RENDERPASSMANAGER_H_
+
 #include "renderInstance/renderPassManager.h"
-#endif
-#ifndef _ENGINEAPI_H_
+
 #include "console/engineAPI.h"
-#endif
 
 #include "gfx/gfxTextureHandle.h"
 

Engine/source/T3D/fx/particle.h

@@ -25,16 +25,14 @@
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
 #pragma once
+#pragma once 
+#pragma once 
 
 #ifndef _PARTICLE_H_
 #define _PARTICLE_H_
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
-#ifndef _GFXTEXTUREHANDLE_H_
+
 #include "gfx/gfxTextureHandle.h"
-#endif
 
 #include "T3D/assets/ImageAsset.h"
 

Engine/source/T3D/fx/particleEmitter.h

@@ -27,22 +27,15 @@
 
 #ifndef _H_PARTICLE_EMITTER
 #define _H_PARTICLE_EMITTER
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
-#ifndef _COLOR_H_
+
 #include "core/color.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
+
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _PARTICLE_H_
+
 #include "T3D/fx/particle.h"
-#endif
 
 class RenderPassManager;
 class ParticleData;

Engine/source/T3D/fx/particleEmitterNode.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PARTICLEEMITTERDUMMY_H_
 #define _PARTICLEEMITTERDUMMY_H_
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
 
 class ParticleEmitterData;
 class ParticleEmitter;

Engine/source/T3D/fx/precipitation.h

@@ -19,19 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PRECIPITATION_H_
 #define _PRECIPITATION_H_
 
 #include "gfx/gfxDevice.h"
 #include "T3D/gameBase/gameBase.h"
-
-#ifndef _GFXPRIMITIVEBUFFER_H_
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _RENDERPASSMANAGER_H_
+
 #include "renderInstance/renderPassManager.h"
-#endif
 
 #include "T3D/assets/ImageAsset.h"
 #include "T3D/assets/SoundAsset.h"

Engine/source/T3D/fx/ribbon.h

@@ -19,21 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RIBBON_H_
 #define _RIBBON_H_
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
 
-#ifndef _GFXPRIMITIVEBUFFER_H_
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
 
-#ifndef _GFXVERTEXBUFFER_H_
 #include "gfx/gfxVertexBuffer.h"
-#endif
 
 #include "materials/materialParameters.h"
 #include "math/util/matrixSet.h"

Engine/source/T3D/fx/ribbonNode.h

@@ -19,13 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _RIBBON_NODE_H_
 #define _RIBBON_NODE_H_
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
 
 class RibbonData;
 class Ribbon;

Engine/source/T3D/fx/splash.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SPLASH_H_
 #define _SPLASH_H_
-
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
 
 #ifndef _TORQUE_LIST_
 #include "core/util/tList.h"

Engine/source/T3D/fx/windEmitter.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _WINDEMITTER_H_
 #define _WINDEMITTER_H_

Engine/source/T3D/gameBase/gameBase.h

@@ -24,29 +24,23 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _GAMEBASE_H_
 #define _GAMEBASE_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _PROCESSLIST_H_
+
 #include "T3D/gameBase/processList.h"
-#endif
-#ifndef _TICKCACHE_H_
+
 #include "T3D/gameBase/tickCache.h"
-#endif
-#ifndef _DYNAMIC_CONSOLETYPES_H_
 #include "console/dynamicTypes.h"
-#endif
+
 #ifndef __SCENEMANAGER_H__  
 #include "scene/sceneManager.h"    
 #define __SCENEMANAGER_H__  
 #endif
-#ifndef _IDISPLAYDEVICE_H_
 #include "platform/output/IDisplayDevice.h"
-#endif
 
 class NetConnection;
 class ProcessList;

Engine/source/T3D/gameBase/gameConnection.h

@@ -24,25 +24,20 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _GAMECONNECTION_H_
 #define _GAMECONNECTION_H_
-
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
-#ifndef _GAMEBASE_H_
+
 #include "T3D/gameBase/gameBase.h"
-#endif
-#ifndef _NETCONNECTION_H_
+
 #include "sim/netConnection.h"
-#endif
-#ifndef _MOVEMANAGER_H_
+
 #include "T3D/gameBase/moveManager.h"
-#endif
-#ifndef _BITVECTOR_H_
+
 #include "core/bitVector.h"
-#endif
 
 enum GameConnectionConstants
 {

Engine/source/T3D/gameBase/gameConnectionEvents.h

@@ -19,25 +19,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GAMECONNECTIONEVENTS_H_
 #define _GAMECONNECTIONEVENTS_H_
-
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
 
-#ifndef _GAMECONNECTION_H_
 #include "T3D/gameBase/gameConnection.h"
-#endif
 
-#ifndef _SFXPROFILE_H_
 #include "sfx/sfxProfile.h"
-#endif
 
-#ifndef _BITSTREAM_H_
 #include "core/stream/bitStream.h"
-#endif
 
 #include "T3D/assets/SoundAsset.h"
 

Engine/source/T3D/gameBase/gameProcess.h

@@ -19,17 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GAMEPROCESS_H_
 #define _GAMEPROCESS_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _PROCESSLIST_H_
-#include "T3D/gameBase/processList.h"
-#endif
 
+#include "T3D/gameBase/processList.h"
 
 class GameBase;
 class GameConnection;

Engine/source/T3D/gameBase/moveList.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _MOVELIST_H_
 #define _MOVELIST_H_
-
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
-#ifndef _MOVEMANAGER_H_
+
 #include "T3D/gameBase/moveManager.h"
-#endif
 
 class BitStream;
 class ResizeBitStream;

Engine/source/T3D/gameBase/moveManager.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _MOVEMANAGER_H_
 #define _MOVEMANAGER_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 enum MoveConstants {
    MaxTriggerKeys = 6,

Engine/source/T3D/gameBase/processList.h

@@ -24,16 +24,14 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _PROCESSLIST_H_
 #define _PROCESSLIST_H_
-
-#ifndef _SIM_H_
 #include "console/sim.h"
-#endif
-#ifndef _TSIGNAL_H_
+
 #include "core/util/tSignal.h"
-#endif
 
 //----------------------------------------------------------------------------
 

Engine/source/T3D/gameBase/std/stdGameProcess.h

@@ -19,14 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _GAMEPROCESS_STD_H_
 #define _GAMEPROCESS_STD_H_
 
 //#include "T3D/gameBase/processList.h"
-#ifndef _GAMEPROCESS_H_
 #include "T3D/gameBase/gameProcess.h"
-#endif
 
 class GameBase;
 class GameConnection;

Engine/source/T3D/gameBase/std/stdMoveList.h

@@ -19,13 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _MOVELIST_STD_H_
 #define _MOVELIST_STD_H_
-
-#ifndef _MOVELIST_H_
 #include "T3D/gameBase/moveList.h"
-#endif
 
 class StdMoveList : public MoveList
 {

Engine/source/T3D/gameBase/tickCache.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TICKCACHE_H_
 #define _TICKCACHE_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 struct Move;
 

Engine/source/T3D/gameFunctions.h

@@ -19,25 +19,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GAMEFUNCTIONS_H_
 #define _GAMEFUNCTIONS_H_
-
-#ifndef _MPOINT3_H_
 #include "math/mPoint3.h"
-#endif
-#ifndef _MMATRIX_H_
+
 #include "math/mMatrix.h"
-#endif
-#ifndef _GFXTARGET_H_
+
 #include "gfx/gfxTarget.h"
-#endif
-#ifndef _MATHUTIL_FRUSTUM_H_
 #include "math/util/frustum.h"
-#endif
-#ifndef _COLOR_H_
+
 #include "core/color.h"
-#endif
 
 struct CameraQuery;
 

Engine/source/T3D/gameMode.h

@@ -3,9 +3,8 @@
 #define GAME_MODE_H
 
 #ifdef TORQUE_TOOLS
-#ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"
-#endif
+
 #endif
 
 #ifndef SUB_SCENE_H

Engine/source/T3D/gameTSCtrl.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GAMETSCTRL_H_
 #define _GAMETSCTRL_H_
-
-#ifndef _GAME_H_
 #include "app/game.h"
-#endif
-#ifndef _GUITSCONTROL_H_
+
 #include "gui/3d/guiTSControl.h"
-#endif
 
 class ProjectileData;
 class GameBase;

Engine/source/T3D/groundPlane.h

@@ -19,19 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _TORQUE_T3D_GROUNDPLANE_H_
 #define _TORQUE_T3D_GROUNDPLANE_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
+
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
 
 #include "T3D/assets/MaterialAsset.h"
 

Engine/source/T3D/guiMaterialPreview.h

@@ -24,6 +24,8 @@
 // GuiMaterialPreview Control for Material Editor Written by Travis Vroman of Gaslight Studios
 // Updated 2-14-09
 // Portions based off Constructor viewport code.
+#pragma once 
+#pragma once 
 
 #ifndef _GUIMATERIALPREVIEW_H_
 #define _GUIMATERIALPREVIEW_H_

Engine/source/T3D/guiObjectView.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GUIOBJECTVIEW_H_
 #define _GUIOBJECTVIEW_H_

Engine/source/T3D/item.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ITEM_H_
 #define _ITEM_H_

Engine/source/T3D/levelInfo.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _LEVELINFO_H_
 #define _LEVELINFO_H_
@@ -35,10 +37,7 @@
 #ifndef _SFXCOMMON_H_
    #include "sfx/sfxCommon.h"
 #endif
-
-#ifndef _GFXTEXTUREHANDLE_H_
 #include "gfx/gfxTextureHandle.h"
-#endif
 
 #include "T3D/assets/ImageAsset.h"
 

Engine/source/T3D/lightAnimData.h

@@ -19,25 +19,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _LIGHTANIMDATA_H_
 #define _LIGHTANIMDATA_H_
-
-#ifndef _SIMDATABLOCK_H_
 #include "console/simDatablock.h"
-#endif
-#ifndef _CONSOLETYPES_H_
+
 #include "console/consoleTypes.h"
-#endif
-#ifndef _MMATRIX_H_
+
 #include "math/mMatrix.h"
-#endif
-#ifndef _MPOINT3_H_
+
 #include "math/mPoint3.h"
-#endif
-#ifndef _COLOR_H_
+
 #include "core/color.h"
-#endif
 
 class LightInfo;
 

Engine/source/T3D/lightBase.h

@@ -24,25 +24,20 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _LIGHTBASE_H_
 #define _LIGHTBASE_H_
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _LIGHTINFO_H_
+
 #include "lighting/lightInfo.h"
-#endif
-#ifndef _ITICKABLE_H_
+
 #include "core/iTickable.h"
-#endif
-#ifndef _LIGHTFLAREDATA_H_
+
 #include "T3D/lightFlareData.h"
-#endif
-#ifndef _LIGHTANIMDATA_H_
+
 #include "T3D/lightAnimData.h"
-#endif
 
 class LightAnimData;
 

Engine/source/T3D/lightDescription.h

@@ -19,25 +19,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _LIGHTDESCRIPTION_H_
 #define _LIGHTDESCRIPTION_H_
-
-#ifndef _SIMDATABLOCK_H_
 #include "console/simDatablock.h"
-#endif
-#ifndef _CONSOLETYPES_H_
+
 #include "console/consoleTypes.h"
-#endif
-#ifndef _COLOR_H_
+
 #include "core/color.h"
-#endif
-#ifndef _LIGHTANIMDATA_H_
+
 #include "T3D/lightAnimData.h"
-#endif
-#ifndef _LIGHTFLAREDATA_H_
+
 #include "T3D/lightFlareData.h"
-#endif
 
 struct LightState
 {

Engine/source/T3D/lightFlareData.h

@@ -19,31 +19,24 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _LIGHTFLAREDATA_H_
 #define _LIGHTFLAREDATA_H_
-
-#ifndef _SIMDATABLOCK_H_
 #include "console/simDatablock.h"
-#endif
-#ifndef _GFXTEXTUREHANDLE_H_
+
 #include "gfx/gfxTextureHandle.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _CONSOLETYPES_H_
+
 #include "console/consoleTypes.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
+
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXSTATEBLOCK_H_
+
 #include "gfx/gfxStateBlock.h"
-#endif
-#ifndef _GFXOCCLUSIONQUERY_H_
+
 #include "gfx/gfxOcclusionQuery.h"
-#endif
 
 #include "T3D/assets/ImageAsset.h"
 

Engine/source/T3D/lighting/IBLUtilities.h

@@ -22,19 +22,11 @@
 
 #ifndef IBL_UTILS_H_
 #define IBL_UTILS_H_
-
-#ifndef _GFXTARGET_H_
 #include "gfx/gfxTarget.h"
-#endif
 
-#ifndef _GFXCUBEMAP_H_
 #include "gfx/gfxCubemap.h"
-#endif
 
-#ifndef _COLOR_H_
 #include "core/color.h"
-#endif
-
 
 namespace IBLUtilities
 {

Engine/source/T3D/lighting/boxEnvironmentProbe.h

@@ -26,20 +26,14 @@
 #ifndef REFLECTIONPROBE_H
 #include "T3D/lighting/reflectionProbe.h"
 #endif
-#ifndef _GFXVERTEXBUFFER_H_
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
-#include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _TSSHAPEINSTANCE_H_
-#include "ts/tsShapeInstance.h"
-#endif
-#include "lighting/lightInfo.h"
 
-#ifndef _RENDERPASSMANAGER_H_
+#include "gfx/gfxPrimitiveBuffer.h"
+
+#include "ts/tsShapeInstance.h"
+
+#include "lighting/lightInfo.h"
 #include "renderInstance/renderPassManager.h"
-#endif
 
 class BaseMatInstance;
 

Engine/source/T3D/lighting/reflectionProbe.h

@@ -22,24 +22,16 @@
 
 #ifndef REFLECTIONPROBE_H
 #define REFLECTIONPROBE_H
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
-#include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
-#include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _TSSHAPEINSTANCE_H_
-#include "ts/tsShapeInstance.h"
-#endif
-#include "lighting/lightInfo.h"
 
-#ifndef _RENDERPASSMANAGER_H_
+#include "gfx/gfxVertexBuffer.h"
+
+#include "gfx/gfxPrimitiveBuffer.h"
+
+#include "ts/tsShapeInstance.h"
+
+#include "lighting/lightInfo.h"
 #include "renderInstance/renderPassManager.h"
-#endif
 
 class BaseMatInstance;
 

Engine/source/T3D/lighting/skylight.h

@@ -26,20 +26,14 @@
 #ifndef REFLECTIONPROBE_H
 #include "T3D/lighting/reflectionProbe.h"
 #endif
-#ifndef _GFXVERTEXBUFFER_H_
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
-#include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _TSSHAPEINSTANCE_H_
-#include "ts/tsShapeInstance.h"
-#endif
-#include "lighting/lightInfo.h"
 
-#ifndef _RENDERPASSMANAGER_H_
+#include "gfx/gfxPrimitiveBuffer.h"
+
+#include "ts/tsShapeInstance.h"
+
+#include "lighting/lightInfo.h"
 #include "renderInstance/renderPassManager.h"
-#endif
 
 class BaseMatInstance;
 

Engine/source/T3D/lighting/sphereEnvironmentProbe.h

@@ -26,20 +26,14 @@
 #ifndef REFLECTIONPROBE_H
 #include "T3D/lighting/reflectionProbe.h"
 #endif
-#ifndef _GFXVERTEXBUFFER_H_
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
-#include "gfx/gfxPrimitiveBuffer.h"
-#endif
-#ifndef _TSSHAPEINSTANCE_H_
-#include "ts/tsShapeInstance.h"
-#endif
-#include "lighting/lightInfo.h"
 
-#ifndef _RENDERPASSMANAGER_H_
+#include "gfx/gfxPrimitiveBuffer.h"
+
+#include "ts/tsShapeInstance.h"
+
+#include "lighting/lightInfo.h"
 #include "renderInstance/renderPassManager.h"
-#endif
 
 class BaseMatInstance;
 

Engine/source/T3D/missionArea.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _MISSIONAREA_H_
 #define _MISSIONAREA_H_
-
-#ifndef _NETOBJECT_H_
 #include "sim/netObject.h"
-#endif
 
 class MissionArea : public NetObject
 {

Engine/source/T3D/missionMarker.h

@@ -19,25 +19,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _MISSIONMARKER_H_
 #define _MISSIONMARKER_H_
-
-#ifndef _BITSTREAM_H_
 #include "core/stream/bitStream.h"
-#endif
-#ifndef _SIMBASE_H_
+
 #include "console/simBase.h"
-#endif
-#ifndef _SHAPEBASE_H_
+
 #include "T3D/shapeBase.h"
-#endif
-#ifndef _MATHIO_H_
+
 #include "math/mathIO.h"
-#endif
-#ifndef _COLOR_H_
+
 #include "core/color.h"
-#endif
 
 class MissionMarkerData : public ShapeBaseData
 {

Engine/source/T3D/notesObject.h

@@ -1,17 +1,11 @@
 #pragma once
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _GFXSTATEBLOCK_H_
+
 #include "gfx/gfxStateBlock.h"
-#endif
-#ifndef _GFXVERTEXBUFFER_H_
+
 #include "gfx/gfxVertexBuffer.h"
-#endif
-#ifndef _GFXPRIMITIVEBUFFER_H_
+
 #include "gfx/gfxPrimitiveBuffer.h"
-#endif
 
 //-----------------------------------------------------------------------------
 // This class implements a basic SceneObject that can exist in the world at a

Engine/source/T3D/objectTypes.h

@@ -24,6 +24,8 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _OBJECTTYPES_H_
 #define _OBJECTTYPES_H_

Engine/source/T3D/occlusionVolume.h

@@ -19,19 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _OCCLUSIONVOLUME_H_
 #define _OCCLUSIONVOLUME_H_
-
-#ifndef _SCENEPOLYHEDRALSPACE_H_
 #include "scene/scenePolyhedralSpace.h"
-#endif
 
-#ifndef _MSILHOUETTEEXTRACTOR_H_
 #include "math/mSilhouetteExtractor.h"
-#endif
-
-
 
 /// A volume in space that blocks visibility.
 class OcclusionVolume : public ScenePolyhedralSpace

Engine/source/T3D/pathCamera.h

@@ -19,18 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PATHCAMERA_H_
 #define _PATHCAMERA_H_
-
-#ifndef _SHAPEBASE_H_
 #include "T3D/shapeBase.h"
-#endif
 
-#ifndef _CAMERASPLINE_H_
 #include "T3D/cameraSpline.h"
-#endif
-
 
 //----------------------------------------------------------------------------
 struct PathCameraData: public ShapeBaseData {

Engine/source/T3D/pathShape.h

@@ -2,21 +2,17 @@
 // Torque Game Engine
 // Copyright (C) GarageGames.com, Inc.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PATHSHAPE_H_
 #define _PATHSHAPE_H_
-
-#ifndef _STATICSHAPE_H_
 #include "T3D/staticShape.h"
-#endif
 
-#ifndef _CAMERASPLINE_H_
 #include "T3D/cameraSpline.h"
-#endif
 
-#ifndef _SIMPATH_H_
 #include "scene/simPath.h"
-#endif
+
 //----------------------------------------------------------------------------
 struct PathShapeData: public StaticShapeData {
    typedef StaticShapeData Parent;

Engine/source/T3D/physicalZone.h

@@ -27,16 +27,11 @@
 
 #ifndef _H_PHYSICALZONE
 #define _H_PHYSICALZONE
-
-#ifndef _SCENEOBJECT_H_
 #include "scene/sceneObject.h"
-#endif
-#ifndef _EARLYOUTPOLYLIST_H_
+
 #include "collision/earlyOutPolyList.h"
-#endif
-#ifndef _MPOLYHEDRON_H_
+
 #include "math/mPolyhedron.h"
-#endif
 
 class Convex;
 

Engine/source/T3D/physics/physicsBody.h

@@ -19,16 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _T3D_PHYSICS_PHYSICSBODY_H_
 #define _T3D_PHYSICS_PHYSICSBODY_H_
-
-#ifndef _T3D_PHYSICSCOMMON_H_
 #include "T3D/physics/physicsCommon.h"
-#endif
-#ifndef _T3D_PHYSICS_PHYSICSOBJECT_H_
+
 #include "T3D/physics/physicsObject.h"
-#endif
 
 class PhysicsCollision;
 class SceneObject;

Engine/source/T3D/physics/physicsCollision.h

@@ -19,13 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _T3D_PHYSICS_PHYSICSCOLLISION_H_
 #define _T3D_PHYSICS_PHYSICSCOLLISION_H_
-
-#ifndef _REFBASE_H_
 #include "core/util/refBase.h"
-#endif
 
 class Point3F;
 #ifndef USE_TEMPLATE_MATRIX

Engine/source/T3D/physics/physicsCommon.h

@@ -19,23 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _T3D_PHYSICSCOMMON_H_
 #define _T3D_PHYSICSCOMMON_H_
-
-#ifndef _MPOINT3_H_
 #include "math/mPoint3.h"
-#endif
-#ifndef _MQUAT_H_
-#include "math/mQuat.h"
-#endif
-#ifndef _MMATRIX_H_
-#include "math/mMatrix.h"
-#endif
-#ifndef _REFBASE_H_
-#include "core/util/refBase.h"
-#endif
 
+#include "math/mQuat.h"
+
+#include "math/mMatrix.h"
+
+#include "core/util/refBase.h"
 
 /// Helper structure which defines the state of a single physics body.
 struct PhysicsState

Engine/source/T3D/physics/physicsDebris.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _PHYSICS_DEBRIS_H_
 #define _PHYSICS_DEBRIS_H_
@@ -26,12 +27,8 @@
 #ifndef __RESOURCE_H__
 #include "core/resource.h"
 #endif
-#ifndef _GAMEBASE_H_
 #include "T3D/gameBase/gameBase.h"
-#endif
-#ifndef _T3D_PHYSICSCOMMON_H_
 #include "T3D/physics/physicsCommon.h"
-#endif
 
 #include "T3D/assets/ShapeAsset.h"
 

Engine/source/T3D/physics/physicsEvents.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PHYSICSEVENTS_H_
 #define _PHYSICSEVENTS_H_
-
-#ifndef _NETCONNECTION_H_
 #include "sim/netConnection.h"
-#endif
 
 class SceneObject;
 class SceneContainer;