diff --git a/Engine/lib/zlib/zconf.h b/Engine/lib/zlib/zconf.h deleted file mode 100644 index 62adc8d84..000000000 --- a/Engine/lib/zlib/zconf.h +++ /dev/null @@ -1,543 +0,0 @@ -/* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#ifndef ZCONF_H -#define ZCONF_H - -/* - * If you *really* need a unique prefix for all types and library functions, - * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. - * Even better than compiling with -DZ_PREFIX would be to use configure to set - * this permanently in zconf.h using "./configure --zprefix". - */ -#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ -# define Z_PREFIX_SET - -/* all linked symbols and init macros */ -# define _dist_code z__dist_code -# define _length_code z__length_code -# define _tr_align z__tr_align -# define _tr_flush_bits z__tr_flush_bits -# define _tr_flush_block z__tr_flush_block -# define _tr_init z__tr_init -# define _tr_stored_block z__tr_stored_block -# define _tr_tally z__tr_tally -# define adler32 z_adler32 -# define adler32_combine z_adler32_combine -# define adler32_combine64 z_adler32_combine64 -# define adler32_z z_adler32_z -# ifndef Z_SOLO -# define compress z_compress -# define compress2 z_compress2 -# define compressBound z_compressBound -# endif -# define crc32 z_crc32 -# define crc32_combine z_crc32_combine -# define crc32_combine64 z_crc32_combine64 -# define crc32_combine_gen z_crc32_combine_gen -# define crc32_combine_gen64 z_crc32_combine_gen64 -# define crc32_combine_op z_crc32_combine_op -# define crc32_z z_crc32_z -# define deflate z_deflate -# define deflateBound z_deflateBound -# define deflateCopy z_deflateCopy -# define deflateEnd z_deflateEnd -# define deflateGetDictionary z_deflateGetDictionary -# define deflateInit z_deflateInit -# define deflateInit2 z_deflateInit2 -# define deflateInit2_ z_deflateInit2_ -# define deflateInit_ z_deflateInit_ -# define deflateParams z_deflateParams -# define deflatePending z_deflatePending -# define deflatePrime z_deflatePrime -# define deflateReset z_deflateReset -# define deflateResetKeep z_deflateResetKeep -# define deflateSetDictionary z_deflateSetDictionary -# define deflateSetHeader z_deflateSetHeader -# define deflateTune z_deflateTune -# define deflate_copyright z_deflate_copyright -# define get_crc_table z_get_crc_table -# ifndef Z_SOLO -# define gz_error z_gz_error -# define gz_intmax z_gz_intmax -# define gz_strwinerror z_gz_strwinerror -# define gzbuffer z_gzbuffer -# define gzclearerr z_gzclearerr -# define gzclose z_gzclose -# define gzclose_r z_gzclose_r -# define gzclose_w z_gzclose_w -# define gzdirect z_gzdirect -# define gzdopen z_gzdopen -# define gzeof z_gzeof -# define gzerror z_gzerror -# define gzflush z_gzflush -# define gzfread z_gzfread -# define gzfwrite z_gzfwrite -# define gzgetc z_gzgetc -# define gzgetc_ z_gzgetc_ -# define gzgets z_gzgets -# define gzoffset z_gzoffset -# define gzoffset64 z_gzoffset64 -# define gzopen z_gzopen -# define gzopen64 z_gzopen64 -# ifdef _WIN32 -# define gzopen_w z_gzopen_w -# endif -# define gzprintf z_gzprintf -# define gzputc z_gzputc -# define gzputs z_gzputs -# define gzread z_gzread -# define gzrewind z_gzrewind -# define gzseek z_gzseek -# define gzseek64 z_gzseek64 -# define gzsetparams z_gzsetparams -# define gztell z_gztell -# define gztell64 z_gztell64 -# define gzungetc z_gzungetc -# define gzvprintf z_gzvprintf -# define gzwrite z_gzwrite -# endif -# define inflate z_inflate -# define inflateBack z_inflateBack -# define inflateBackEnd z_inflateBackEnd -# define inflateBackInit z_inflateBackInit -# define inflateBackInit_ z_inflateBackInit_ -# define inflateCodesUsed z_inflateCodesUsed -# define inflateCopy z_inflateCopy -# define inflateEnd z_inflateEnd -# define inflateGetDictionary z_inflateGetDictionary -# define inflateGetHeader z_inflateGetHeader -# define inflateInit z_inflateInit -# define inflateInit2 z_inflateInit2 -# define inflateInit2_ z_inflateInit2_ -# define inflateInit_ z_inflateInit_ -# define inflateMark z_inflateMark -# define inflatePrime z_inflatePrime -# define inflateReset z_inflateReset -# define inflateReset2 z_inflateReset2 -# define inflateResetKeep z_inflateResetKeep -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateSyncPoint z_inflateSyncPoint -# define inflateUndermine z_inflateUndermine -# define inflateValidate z_inflateValidate -# define inflate_copyright z_inflate_copyright -# define inflate_fast z_inflate_fast -# define inflate_table z_inflate_table -# ifndef Z_SOLO -# define uncompress z_uncompress -# define uncompress2 z_uncompress2 -# endif -# define zError z_zError -# ifndef Z_SOLO -# define zcalloc z_zcalloc -# define zcfree z_zcfree -# endif -# define zlibCompileFlags z_zlibCompileFlags -# define zlibVersion z_zlibVersion - -/* all zlib typedefs in zlib.h and zconf.h */ -# define Byte z_Byte -# define Bytef z_Bytef -# define alloc_func z_alloc_func -# define charf z_charf -# define free_func z_free_func -# ifndef Z_SOLO -# define gzFile z_gzFile -# endif -# define gz_header z_gz_header -# define gz_headerp z_gz_headerp -# define in_func z_in_func -# define intf z_intf -# define out_func z_out_func -# define uInt z_uInt -# define uIntf z_uIntf -# define uLong z_uLong -# define uLongf z_uLongf -# define voidp z_voidp -# define voidpc z_voidpc -# define voidpf z_voidpf - -/* all zlib structs in zlib.h and zconf.h */ -# define gz_header_s z_gz_header_s -# define internal_state z_internal_state - -#endif - -#if defined(__MSDOS__) && !defined(MSDOS) -# define MSDOS -#endif -#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) -# define OS2 -#endif -#if defined(_WINDOWS) && !defined(WINDOWS) -# define WINDOWS -#endif -#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) -# ifndef WIN32 -# define WIN32 -# endif -#endif -#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) -# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) -# ifndef SYS16BIT -# define SYS16BIT -# endif -# endif -#endif - -/* - * Compile with -DMAXSEG_64K if the alloc function cannot allocate more - * than 64k bytes at a time (needed on systems with 16-bit int). - */ -#ifdef SYS16BIT -# define MAXSEG_64K -#endif -#ifdef MSDOS -# define UNALIGNED_OK -#endif - -#ifdef __STDC_VERSION__ -# ifndef STDC -# define STDC -# endif -# if __STDC_VERSION__ >= 199901L -# ifndef STDC99 -# define STDC99 -# endif -# endif -#endif -#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) -# define STDC -#endif -#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) -# define STDC -#endif -#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) -# define STDC -#endif -#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) -# define STDC -#endif - -#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ -# define STDC -#endif - -#ifndef STDC -# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ -# define const /* note: need a more gentle solution here */ -# endif -#endif - -#if defined(ZLIB_CONST) && !defined(z_const) -# define z_const const -#else -# define z_const -#endif - -#ifdef Z_SOLO -# ifdef _WIN64 - typedef unsigned long long z_size_t; -# else - typedef unsigned long z_size_t; -# endif -#else -# define z_longlong long long -# if defined(NO_SIZE_T) - typedef unsigned NO_SIZE_T z_size_t; -# elif defined(STDC) -# include - typedef size_t z_size_t; -# else - typedef unsigned long z_size_t; -# endif -# undef z_longlong -#endif - -/* Maximum value for memLevel in deflateInit2 */ -#ifndef MAX_MEM_LEVEL -# ifdef MAXSEG_64K -# define MAX_MEM_LEVEL 8 -# else -# define MAX_MEM_LEVEL 9 -# endif -#endif - -/* Maximum value for windowBits in deflateInit2 and inflateInit2. - * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files - * created by gzip. (Files created by minigzip can still be extracted by - * gzip.) - */ -#ifndef MAX_WBITS -# define MAX_WBITS 15 /* 32K LZ77 window */ -#endif - -/* The memory requirements for deflate are (in bytes): - (1 << (windowBits+2)) + (1 << (memLevel+9)) - that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) - plus a few kilobytes for small objects. For example, if you want to reduce - the default memory requirements from 256K to 128K, compile with - make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" - Of course this will generally degrade compression (there's no free lunch). - - The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus about 7 kilobytes - for small objects. -*/ - - /* Type declarations */ - -#ifndef OF /* function prototypes */ -# ifdef STDC -# define OF(args) args -# else -# define OF(args) () -# endif -#endif - -/* The following definitions for FAR are needed only for MSDOS mixed - * model programming (small or medium model with some far allocations). - * This was tested only with MSC; for other MSDOS compilers you may have - * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, - * just define FAR to be empty. - */ -#ifdef SYS16BIT -# if defined(M_I86SM) || defined(M_I86MM) - /* MSC small or medium model */ -# define SMALL_MEDIUM -# ifdef _MSC_VER -# define FAR _far -# else -# define FAR far -# endif -# endif -# if (defined(__SMALL__) || defined(__MEDIUM__)) - /* Turbo C small or medium model */ -# define SMALL_MEDIUM -# ifdef __BORLANDC__ -# define FAR _far -# else -# define FAR far -# endif -# endif -#endif - -#if defined(WINDOWS) || defined(WIN32) - /* If building or using zlib as a DLL, define ZLIB_DLL. - * This is not mandatory, but it offers a little performance increase. - */ -# ifdef ZLIB_DLL -# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) -# ifdef ZLIB_INTERNAL -# define ZEXTERN extern __declspec(dllexport) -# else -# define ZEXTERN extern __declspec(dllimport) -# endif -# endif -# endif /* ZLIB_DLL */ - /* If building or using zlib with the WINAPI/WINAPIV calling convention, - * define ZLIB_WINAPI. - * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. - */ -# ifdef ZLIB_WINAPI -# ifdef FAR -# undef FAR -# endif -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include - /* No need for _export, use ZLIB.DEF instead. */ - /* For complete Windows compatibility, use WINAPI, not __stdcall. */ -# define ZEXPORT WINAPI -# ifdef WIN32 -# define ZEXPORTVA WINAPIV -# else -# define ZEXPORTVA FAR CDECL -# endif -# endif -#endif - -#if defined (__BEOS__) -# ifdef ZLIB_DLL -# ifdef ZLIB_INTERNAL -# define ZEXPORT __declspec(dllexport) -# define ZEXPORTVA __declspec(dllexport) -# else -# define ZEXPORT __declspec(dllimport) -# define ZEXPORTVA __declspec(dllimport) -# endif -# endif -#endif - -#ifndef ZEXTERN -# define ZEXTERN extern -#endif -#ifndef ZEXPORT -# define ZEXPORT -#endif -#ifndef ZEXPORTVA -# define ZEXPORTVA -#endif - -#ifndef FAR -# define FAR -#endif - -#if !defined(__MACTYPES__) -typedef unsigned char Byte; /* 8 bits */ -#endif -typedef unsigned int uInt; /* 16 bits or more */ -typedef unsigned long uLong; /* 32 bits or more */ - -#ifdef SMALL_MEDIUM - /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ -# define Bytef Byte FAR -#else - typedef Byte FAR Bytef; -#endif -typedef char FAR charf; -typedef int FAR intf; -typedef uInt FAR uIntf; -typedef uLong FAR uLongf; - -#ifdef STDC - typedef void const *voidpc; - typedef void FAR *voidpf; - typedef void *voidp; -#else - typedef Byte const *voidpc; - typedef Byte FAR *voidpf; - typedef Byte *voidp; -#endif - -#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) -# include -# if (UINT_MAX == 0xffffffffUL) -# define Z_U4 unsigned -# elif (ULONG_MAX == 0xffffffffUL) -# define Z_U4 unsigned long -# elif (USHRT_MAX == 0xffffffffUL) -# define Z_U4 unsigned short -# endif -#endif - -#ifdef Z_U4 - typedef Z_U4 z_crc_t; -#else - typedef unsigned long z_crc_t; -#endif - -#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ -# define Z_HAVE_UNISTD_H -#endif - -#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ -# define Z_HAVE_STDARG_H -#endif - -#ifdef STDC -# ifndef Z_SOLO -# include /* for off_t */ -# endif -#endif - -#if defined(STDC) || defined(Z_HAVE_STDARG_H) -# ifndef Z_SOLO -# include /* for va_list */ -# endif -#endif - -#ifdef _WIN32 -# ifndef Z_SOLO -# include /* for wchar_t */ -# endif -#endif - -/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and - * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even - * though the former does not conform to the LFS document), but considering - * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as - * equivalently requesting no 64-bit operations - */ -#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 -# undef _LARGEFILE64_SOURCE -#endif - -#ifndef Z_HAVE_UNISTD_H -# ifdef __WATCOMC__ -# define Z_HAVE_UNISTD_H -# endif -#endif -#ifndef Z_HAVE_UNISTD_H -# if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32) -# define Z_HAVE_UNISTD_H -# endif -#endif -#ifndef Z_SOLO -# if defined(Z_HAVE_UNISTD_H) -# include /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ -# ifdef VMS -# include /* for off_t */ -# endif -# ifndef z_off_t -# define z_off_t off_t -# endif -# endif -#endif - -#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 -# define Z_LFS64 -#endif - -#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) -# define Z_LARGE64 -#endif - -#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) -# define Z_WANT64 -#endif - -#if !defined(SEEK_SET) && !defined(Z_SOLO) -# define SEEK_SET 0 /* Seek from beginning of file. */ -# define SEEK_CUR 1 /* Seek from current position. */ -# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ -#endif - -#ifndef z_off_t -# define z_off_t long -#endif - -#if !defined(_WIN32) && defined(Z_LARGE64) -# define z_off64_t off64_t -#else -# if defined(_WIN32) && !defined(__GNUC__) -# define z_off64_t __int64 -# else -# define z_off64_t z_off_t -# endif -#endif - -/* MVS linker does not support external names larger than 8 bytes */ -#if defined(__MVS__) - #pragma map(deflateInit_,"DEIN") - #pragma map(deflateInit2_,"DEIN2") - #pragma map(deflateEnd,"DEEND") - #pragma map(deflateBound,"DEBND") - #pragma map(inflateInit_,"ININ") - #pragma map(inflateInit2_,"ININ2") - #pragma map(inflateEnd,"INEND") - #pragma map(inflateSync,"INSY") - #pragma map(inflateSetDictionary,"INSEDI") - #pragma map(compressBound,"CMBND") - #pragma map(inflate_table,"INTABL") - #pragma map(inflate_fast,"INFA") - #pragma map(inflate_copyright,"INCOPY") -#endif - -#endif /* ZCONF_H */ diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt index 2ca86a2f7..8d3744b01 100644 --- a/Engine/source/CMakeLists.txt +++ b/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} + $<$:${_TORQUE_MSVC_DEBUG}> + $<$:${_TORQUE_MSVC_RELWITHDEBINFO}> + $<$:${_TORQUE_MSVC_RELEASE}> + ) + + target_link_options(${TORQUE_APP_NAME} PRIVATE + $<$:/DEBUG:FASTLINK /INCREMENTAL> + $<$:/INCREMENTAL /DEBUG:FASTLINK /OPT:REF /OPT:ICF> + $<$:/INCREMENTAL> + ) + + if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING) + target_compile_options(TorqueEngine PRIVATE + ${_TORQUE_MSVC_ALL} + $<$:${_TORQUE_MSVC_DEBUG}> + $<$:${_TORQUE_MSVC_RELWITHDEBINFO}> + $<$:${_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} + $<$:${_TORQUE_UNIX_DEBUG}> + $<$:${_TORQUE_UNIX_RELWITHDEBINFO}> + $<$:${_TORQUE_UNIX_RELEASE}> + ) + + target_link_options(${TORQUE_APP_NAME} PRIVATE + $<$:${_TORQUE_UNIX_RELEASE_LINK}> + ) + + if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING) + target_compile_options(TorqueEngine PRIVATE + ${_TORQUE_UNIX_ALL} + $<$:${_TORQUE_UNIX_DEBUG}> + $<$:${_TORQUE_UNIX_RELWITHDEBINFO}> + $<$:${_TORQUE_UNIX_RELEASE}> + ) + target_link_options(TorqueEngine PRIVATE + $<$:${_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 + + + + + + + + + + + + + "console/engineObject.h" +) if(TORQUE_TESTING) if(WIN32) diff --git a/Engine/source/T3D/AI/AIAimTarget.h b/Engine/source/T3D/AI/AIAimTarget.h index 4c609af27..a0f139f60 100644 --- a/Engine/source/T3D/AI/AIAimTarget.h +++ b/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_ diff --git a/Engine/source/T3D/AI/AIController.h b/Engine/source/T3D/AI/AIController.h index fdd9eb9df..da32eb7c4 100644 --- a/Engine/source/T3D/AI/AIController.h +++ b/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" diff --git a/Engine/source/T3D/AI/AICover.h b/Engine/source/T3D/AI/AICover.h index e18863bcf..8176b47e0 100644 --- a/Engine/source/T3D/AI/AICover.h +++ b/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_ diff --git a/Engine/source/T3D/AI/AIGoal.h b/Engine/source/T3D/AI/AIGoal.h index e8a22b873..4174df7e9 100644 --- a/Engine/source/T3D/AI/AIGoal.h +++ b/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_ diff --git a/Engine/source/T3D/AI/AIInfo.h b/Engine/source/T3D/AI/AIInfo.h index 8aede0cae..303e425a2 100644 --- a/Engine/source/T3D/AI/AIInfo.h +++ b/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 diff --git a/Engine/source/T3D/AI/AINavigation.h b/Engine/source/T3D/AI/AINavigation.h index abc514011..f660e2b2e 100644 --- a/Engine/source/T3D/AI/AINavigation.h +++ b/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_ diff --git a/Engine/source/T3D/Scene.h b/Engine/source/T3D/Scene.h index c6b035a59..57635b1df 100644 --- a/Engine/source/T3D/Scene.h +++ b/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" diff --git a/Engine/source/T3D/SceneGroup.h b/Engine/source/T3D/SceneGroup.h index 66ecfff77..ee8e9e75d 100644 --- a/Engine/source/T3D/SceneGroup.h +++ b/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 { diff --git a/Engine/source/T3D/accumulationVolume.h b/Engine/source/T3D/accumulationVolume.h index 0c5fe4fe1..8ccc585a9 100644 --- a/Engine/source/T3D/accumulationVolume.h +++ b/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_ diff --git a/Engine/source/T3D/aiClient.h b/Engine/source/T3D/aiClient.h index b65f88f95..8e432bd8b 100644 --- a/Engine/source/T3D/aiClient.h +++ b/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; diff --git a/Engine/source/T3D/aiConnection.h b/Engine/source/T3D/aiConnection.h index 63707853c..13066bed2 100644 --- a/Engine/source/T3D/aiConnection.h +++ b/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 //----------------------------------------------------------------------------- diff --git a/Engine/source/T3D/aiPlayer.h b/Engine/source/T3D/aiPlayer.h index e5d41330d..9626253c2 100644 --- a/Engine/source/T3D/aiPlayer.h +++ b/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" diff --git a/Engine/source/T3D/assets/CppAsset.h b/Engine/source/T3D/assets/CppAsset.h index c7d99e81e..eb2c37d7a 100644 --- a/Engine/source/T3D/assets/CppAsset.h +++ b/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 diff --git a/Engine/source/T3D/assets/CubemapAsset.h b/Engine/source/T3D/assets/CubemapAsset.h index bb0a17d6a..d7500c929 100644 --- a/Engine/source/T3D/assets/CubemapAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/ExampleAsset.h b/Engine/source/T3D/assets/ExampleAsset.h index 2a6efa5a3..8bb96f23f 100644 --- a/Engine/source/T3D/assets/ExampleAsset.h +++ b/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 diff --git a/Engine/source/T3D/assets/GUIAsset.h b/Engine/source/T3D/assets/GUIAsset.h index 9b1b1363d..24c8d4743 100644 --- a/Engine/source/T3D/assets/GUIAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/GameObjectAsset.h b/Engine/source/T3D/assets/GameObjectAsset.h index e4d1f71c1..7159a72be 100644 --- a/Engine/source/T3D/assets/GameObjectAsset.h +++ b/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 diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index f0ed2eac8..0f0edc4c0 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/ImageAssetInspectors.h b/Engine/source/T3D/assets/ImageAssetInspectors.h index b43460293..0af717c84 100644 --- a/Engine/source/T3D/assets/ImageAssetInspectors.h +++ b/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 #ifdef TORQUE_TOOLS diff --git a/Engine/source/T3D/assets/LevelAsset.h b/Engine/source/T3D/assets/LevelAsset.h index a085c46ee..16e5b0cb8 100644 --- a/Engine/source/T3D/assets/LevelAsset.h +++ b/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 //----------------------------------------------------------------------------- diff --git a/Engine/source/T3D/assets/MaterialAsset.h b/Engine/source/T3D/assets/MaterialAsset.h index 052442265..e8cc8684b 100644 --- a/Engine/source/T3D/assets/MaterialAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/ParticleAsset.h b/Engine/source/T3D/assets/ParticleAsset.h index 99d854327..c11e164e9 100644 --- a/Engine/source/T3D/assets/ParticleAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/PostEffectAsset.h b/Engine/source/T3D/assets/PostEffectAsset.h index 2fb942230..9af558a34 100644 --- a/Engine/source/T3D/assets/PostEffectAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/ScriptAsset.h b/Engine/source/T3D/assets/ScriptAsset.h index 5373a6314..45ca447fb 100644 --- a/Engine/source/T3D/assets/ScriptAsset.h +++ b/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 diff --git a/Engine/source/T3D/assets/ShapeAnimationAsset.h b/Engine/source/T3D/assets/ShapeAnimationAsset.h index 1755e695d..6aab6ac50 100644 --- a/Engine/source/T3D/assets/ShapeAnimationAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/ShapeAsset.h b/Engine/source/T3D/assets/ShapeAsset.h index a403b8771..4e846a024 100644 --- a/Engine/source/T3D/assets/ShapeAsset.h +++ b/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 diff --git a/Engine/source/T3D/assets/SoundAsset.h b/Engine/source/T3D/assets/SoundAsset.h index 5cc586aa0..73f439c75 100644 --- a/Engine/source/T3D/assets/SoundAsset.h +++ b/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; diff --git a/Engine/source/T3D/assets/SoundAssetInspectors.h b/Engine/source/T3D/assets/SoundAssetInspectors.h index ab74516a2..701a4fc6c 100644 --- a/Engine/source/T3D/assets/SoundAssetInspectors.h +++ b/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 diff --git a/Engine/source/T3D/assets/SubSceneAsset.h b/Engine/source/T3D/assets/SubSceneAsset.h index 4134d0959..68f51694a 100644 --- a/Engine/source/T3D/assets/SubSceneAsset.h +++ b/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 { diff --git a/Engine/source/T3D/assets/TerrainAsset.h b/Engine/source/T3D/assets/TerrainAsset.h index 2f5f93520..2655a4163 100644 --- a/Engine/source/T3D/assets/TerrainAsset.h +++ b/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" diff --git a/Engine/source/T3D/assets/TerrainMaterialAsset.h b/Engine/source/T3D/assets/TerrainMaterialAsset.h index f3a85201b..b6b7a8237 100644 --- a/Engine/source/T3D/assets/TerrainMaterialAsset.h +++ b/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 diff --git a/Engine/source/T3D/assets/stateMachineAsset.h b/Engine/source/T3D/assets/stateMachineAsset.h index c1ccc24cf..d42289b2f 100644 --- a/Engine/source/T3D/assets/stateMachineAsset.h +++ b/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" diff --git a/Engine/source/T3D/camera.h b/Engine/source/T3D/camera.h index 5057f8a48..1336602ae 100644 --- a/Engine/source/T3D/camera.h +++ b/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 { diff --git a/Engine/source/T3D/cameraSpline.h b/Engine/source/T3D/cameraSpline.h index aa9d3152e..56a27b235 100644 --- a/Engine/source/T3D/cameraSpline.h +++ b/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_ diff --git a/Engine/source/T3D/containerQuery.h b/Engine/source/T3D/containerQuery.h index 717d7f85a..ded9fe572 100644 --- a/Engine/source/T3D/containerQuery.h +++ b/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; diff --git a/Engine/source/T3D/convexShape.h b/Engine/source/T3D/convexShape.h index 67918b038..bd1e1de7a 100644 --- a/Engine/source/T3D/convexShape.h +++ b/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" diff --git a/Engine/source/T3D/debris.h b/Engine/source/T3D/debris.h index 8cfe49c3a..170632453 100644 --- a/Engine/source/T3D/debris.h +++ b/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" diff --git a/Engine/source/T3D/decal/decalData.h b/Engine/source/T3D/decal/decalData.h index 26a2d4269..0e3164b17 100644 --- a/Engine/source/T3D/decal/decalData.h +++ b/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" diff --git a/Engine/source/T3D/decal/decalDataFile.h b/Engine/source/T3D/decal/decalDataFile.h index abe46ecfd..718dcff59 100644 --- a/Engine/source/T3D/decal/decalDataFile.h +++ b/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; diff --git a/Engine/source/T3D/decal/decalInstance.h b/Engine/source/T3D/decal/decalInstance.h index 5f4e87bc7..d068384f6 100644 --- a/Engine/source/T3D/decal/decalInstance.h +++ b/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; diff --git a/Engine/source/T3D/decal/decalManager.h b/Engine/source/T3D/decal/decalManager.h index edeef194e..6b6099f1a 100644 --- a/Engine/source/T3D/decal/decalManager.h +++ b/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 diff --git a/Engine/source/T3D/decal/decalSphere.h b/Engine/source/T3D/decal/decalSphere.h index f57209b62..0a77f9ff1 100644 --- a/Engine/source/T3D/decal/decalSphere.h +++ b/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; diff --git a/Engine/source/T3D/examples/renderMeshExample.h b/Engine/source/T3D/examples/renderMeshExample.h index dd8ea12bc..e0a60a4da 100644 --- a/Engine/source/T3D/examples/renderMeshExample.h +++ b/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" diff --git a/Engine/source/T3D/examples/renderObjectExample.h b/Engine/source/T3D/examples/renderObjectExample.h index e971dcf15..bab398b3b 100644 --- a/Engine/source/T3D/examples/renderObjectExample.h +++ b/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; diff --git a/Engine/source/T3D/examples/renderShapeExample.h b/Engine/source/T3D/examples/renderShapeExample.h index 7fbd98dc3..523653d1a 100644 --- a/Engine/source/T3D/examples/renderShapeExample.h +++ b/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" diff --git a/Engine/source/T3D/fx/cameraFXMgr.h b/Engine/source/T3D/fx/cameraFXMgr.h index 2bebf1059..9597ba334 100644 --- a/Engine/source/T3D/fx/cameraFXMgr.h +++ b/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 diff --git a/Engine/source/T3D/fx/explosion.h b/Engine/source/T3D/fx/explosion.h index f62b1be0e..7022c5b79 100644 --- a/Engine/source/T3D/fx/explosion.h +++ b/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" diff --git a/Engine/source/T3D/fx/fxFoliageReplicator.h b/Engine/source/T3D/fx/fxFoliageReplicator.h index a37c16eb6..eb188c64f 100644 --- a/Engine/source/T3D/fx/fxFoliageReplicator.h +++ b/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 ) diff --git a/Engine/source/T3D/fx/fxShapeReplicator.h b/Engine/source/T3D/fx/fxShapeReplicator.h index 23c7dde72..0e5dee976 100644 --- a/Engine/source/T3D/fx/fxShapeReplicator.h +++ b/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) diff --git a/Engine/source/T3D/fx/groundCover.h b/Engine/source/T3D/fx/groundCover.h index d7d0ab9cf..79345240d 100644 --- a/Engine/source/T3D/fx/groundCover.h +++ b/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 diff --git a/Engine/source/T3D/fx/lightning.h b/Engine/source/T3D/fx/lightning.h index 55834251c..1106edd90 100644 --- a/Engine/source/T3D/fx/lightning.h +++ b/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" diff --git a/Engine/source/T3D/fx/particle.h b/Engine/source/T3D/fx/particle.h index 6ebd45401..98ba24f06 100644 --- a/Engine/source/T3D/fx/particle.h +++ b/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" diff --git a/Engine/source/T3D/fx/particleEmitter.h b/Engine/source/T3D/fx/particleEmitter.h index c51c682c8..604dfc3cc 100644 --- a/Engine/source/T3D/fx/particleEmitter.h +++ b/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; diff --git a/Engine/source/T3D/fx/particleEmitterNode.h b/Engine/source/T3D/fx/particleEmitterNode.h index ddbd5a1c0..f45a91b56 100644 --- a/Engine/source/T3D/fx/particleEmitterNode.h +++ b/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; diff --git a/Engine/source/T3D/fx/precipitation.h b/Engine/source/T3D/fx/precipitation.h index 96fe3844e..283972e56 100644 --- a/Engine/source/T3D/fx/precipitation.h +++ b/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" diff --git a/Engine/source/T3D/fx/ribbon.h b/Engine/source/T3D/fx/ribbon.h index ff4bd4583..6c438b47d 100644 --- a/Engine/source/T3D/fx/ribbon.h +++ b/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" diff --git a/Engine/source/T3D/fx/ribbonNode.h b/Engine/source/T3D/fx/ribbonNode.h index 4e7aed65d..da10eae04 100644 --- a/Engine/source/T3D/fx/ribbonNode.h +++ b/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; diff --git a/Engine/source/T3D/fx/splash.h b/Engine/source/T3D/fx/splash.h index 8ac072b9b..a1567ee27 100644 --- a/Engine/source/T3D/fx/splash.h +++ b/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" diff --git a/Engine/source/T3D/fx/windEmitter.h b/Engine/source/T3D/fx/windEmitter.h index 9cfa6b086..93e353ba7 100644 --- a/Engine/source/T3D/fx/windEmitter.h +++ b/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_ diff --git a/Engine/source/T3D/gameBase/gameBase.h b/Engine/source/T3D/gameBase/gameBase.h index cfdc10bf4..d8a2904ab 100644 --- a/Engine/source/T3D/gameBase/gameBase.h +++ b/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; diff --git a/Engine/source/T3D/gameBase/gameConnection.h b/Engine/source/T3D/gameBase/gameConnection.h index 61558be3d..0440e9ebc 100644 --- a/Engine/source/T3D/gameBase/gameConnection.h +++ b/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 { diff --git a/Engine/source/T3D/gameBase/gameConnectionEvents.h b/Engine/source/T3D/gameBase/gameConnectionEvents.h index c301ff29a..16b8e373a 100644 --- a/Engine/source/T3D/gameBase/gameConnectionEvents.h +++ b/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" diff --git a/Engine/source/T3D/gameBase/gameProcess.h b/Engine/source/T3D/gameBase/gameProcess.h index bc4cda113..676d6baaa 100644 --- a/Engine/source/T3D/gameBase/gameProcess.h +++ b/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; diff --git a/Engine/source/T3D/gameBase/moveList.h b/Engine/source/T3D/gameBase/moveList.h index 7c68c3a2d..3c0001068 100644 --- a/Engine/source/T3D/gameBase/moveList.h +++ b/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; diff --git a/Engine/source/T3D/gameBase/moveManager.h b/Engine/source/T3D/gameBase/moveManager.h index 539046dc4..ecbebfc2f 100644 --- a/Engine/source/T3D/gameBase/moveManager.h +++ b/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, diff --git a/Engine/source/T3D/gameBase/processList.h b/Engine/source/T3D/gameBase/processList.h index 0ac4ecb2c..59ea940e4 100644 --- a/Engine/source/T3D/gameBase/processList.h +++ b/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 //---------------------------------------------------------------------------- diff --git a/Engine/source/T3D/gameBase/std/stdGameProcess.h b/Engine/source/T3D/gameBase/std/stdGameProcess.h index cc7fae344..170d5bc44 100644 --- a/Engine/source/T3D/gameBase/std/stdGameProcess.h +++ b/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; diff --git a/Engine/source/T3D/gameBase/std/stdMoveList.h b/Engine/source/T3D/gameBase/std/stdMoveList.h index fc1d3c87a..a6a8a9998 100644 --- a/Engine/source/T3D/gameBase/std/stdMoveList.h +++ b/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 { diff --git a/Engine/source/T3D/gameBase/tickCache.h b/Engine/source/T3D/gameBase/tickCache.h index 8f945f227..6c3861b8a 100644 --- a/Engine/source/T3D/gameBase/tickCache.h +++ b/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; diff --git a/Engine/source/T3D/gameFunctions.h b/Engine/source/T3D/gameFunctions.h index c772cde5a..14e021dfd 100644 --- a/Engine/source/T3D/gameFunctions.h +++ b/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; diff --git a/Engine/source/T3D/gameMode.h b/Engine/source/T3D/gameMode.h index 465a614f2..39c360d94 100644 --- a/Engine/source/T3D/gameMode.h +++ b/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 diff --git a/Engine/source/T3D/gameTSCtrl.h b/Engine/source/T3D/gameTSCtrl.h index c3be615f8..af9bb0d26 100644 --- a/Engine/source/T3D/gameTSCtrl.h +++ b/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; diff --git a/Engine/source/T3D/groundPlane.h b/Engine/source/T3D/groundPlane.h index e05a8132e..d57bceec1 100644 --- a/Engine/source/T3D/groundPlane.h +++ b/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" diff --git a/Engine/source/T3D/guiMaterialPreview.h b/Engine/source/T3D/guiMaterialPreview.h index acadf44dc..9d69d1950 100644 --- a/Engine/source/T3D/guiMaterialPreview.h +++ b/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_ diff --git a/Engine/source/T3D/guiObjectView.h b/Engine/source/T3D/guiObjectView.h index 52a11833b..7c197b4a2 100644 --- a/Engine/source/T3D/guiObjectView.h +++ b/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_ diff --git a/Engine/source/T3D/item.h b/Engine/source/T3D/item.h index 22536c9eb..90ac7635d 100644 --- a/Engine/source/T3D/item.h +++ b/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_ diff --git a/Engine/source/T3D/levelInfo.h b/Engine/source/T3D/levelInfo.h index 593910dd4..b3377bc61 100644 --- a/Engine/source/T3D/levelInfo.h +++ b/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" diff --git a/Engine/source/T3D/lightAnimData.h b/Engine/source/T3D/lightAnimData.h index bba14644f..5133bdee9 100644 --- a/Engine/source/T3D/lightAnimData.h +++ b/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; diff --git a/Engine/source/T3D/lightBase.h b/Engine/source/T3D/lightBase.h index e11a5504b..1d851e2f5 100644 --- a/Engine/source/T3D/lightBase.h +++ b/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; diff --git a/Engine/source/T3D/lightDescription.h b/Engine/source/T3D/lightDescription.h index e29eaa8b9..a4770855f 100644 --- a/Engine/source/T3D/lightDescription.h +++ b/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 { diff --git a/Engine/source/T3D/lightFlareData.h b/Engine/source/T3D/lightFlareData.h index e31c8c752..a6ca6f40d 100644 --- a/Engine/source/T3D/lightFlareData.h +++ b/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" diff --git a/Engine/source/T3D/lighting/IBLUtilities.h b/Engine/source/T3D/lighting/IBLUtilities.h index 12f4e4ace..4d4e9faa4 100644 --- a/Engine/source/T3D/lighting/IBLUtilities.h +++ b/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 { diff --git a/Engine/source/T3D/lighting/boxEnvironmentProbe.h b/Engine/source/T3D/lighting/boxEnvironmentProbe.h index 95758874a..4d255f584 100644 --- a/Engine/source/T3D/lighting/boxEnvironmentProbe.h +++ b/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; diff --git a/Engine/source/T3D/lighting/reflectionProbe.h b/Engine/source/T3D/lighting/reflectionProbe.h index da5dc8341..9195a938e 100644 --- a/Engine/source/T3D/lighting/reflectionProbe.h +++ b/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; diff --git a/Engine/source/T3D/lighting/skylight.h b/Engine/source/T3D/lighting/skylight.h index 75e6d2b82..e5a552037 100644 --- a/Engine/source/T3D/lighting/skylight.h +++ b/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; diff --git a/Engine/source/T3D/lighting/sphereEnvironmentProbe.h b/Engine/source/T3D/lighting/sphereEnvironmentProbe.h index 611d121d2..67bb78f0e 100644 --- a/Engine/source/T3D/lighting/sphereEnvironmentProbe.h +++ b/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; diff --git a/Engine/source/T3D/missionArea.h b/Engine/source/T3D/missionArea.h index 12df6b967..37c35ae0a 100644 --- a/Engine/source/T3D/missionArea.h +++ b/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 { diff --git a/Engine/source/T3D/missionMarker.h b/Engine/source/T3D/missionMarker.h index a19348114..c056e9fd0 100644 --- a/Engine/source/T3D/missionMarker.h +++ b/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 { diff --git a/Engine/source/T3D/notesObject.h b/Engine/source/T3D/notesObject.h index db32fd4de..f3b2ef197 100644 --- a/Engine/source/T3D/notesObject.h +++ b/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 diff --git a/Engine/source/T3D/objectTypes.h b/Engine/source/T3D/objectTypes.h index 47fb2edee..0724c7d4b 100644 --- a/Engine/source/T3D/objectTypes.h +++ b/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_ diff --git a/Engine/source/T3D/occlusionVolume.h b/Engine/source/T3D/occlusionVolume.h index 8976ec1b7..8a037bf33 100644 --- a/Engine/source/T3D/occlusionVolume.h +++ b/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 diff --git a/Engine/source/T3D/pathCamera.h b/Engine/source/T3D/pathCamera.h index f9ce8ab66..11dd602b5 100644 --- a/Engine/source/T3D/pathCamera.h +++ b/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 { diff --git a/Engine/source/T3D/pathShape.h b/Engine/source/T3D/pathShape.h index c491cdbc1..ea8b10b10 100644 --- a/Engine/source/T3D/pathShape.h +++ b/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; diff --git a/Engine/source/T3D/physicalZone.h b/Engine/source/T3D/physicalZone.h index 5aa7385d9..43cc53eeb 100644 --- a/Engine/source/T3D/physicalZone.h +++ b/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; diff --git a/Engine/source/T3D/physics/physicsBody.h b/Engine/source/T3D/physics/physicsBody.h index 39fd86ef8..de81787e2 100644 --- a/Engine/source/T3D/physics/physicsBody.h +++ b/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; diff --git a/Engine/source/T3D/physics/physicsCollision.h b/Engine/source/T3D/physics/physicsCollision.h index 0f4e5a095..01407d871 100644 --- a/Engine/source/T3D/physics/physicsCollision.h +++ b/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 diff --git a/Engine/source/T3D/physics/physicsCommon.h b/Engine/source/T3D/physics/physicsCommon.h index ea9817b06..df53c9e02 100644 --- a/Engine/source/T3D/physics/physicsCommon.h +++ b/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 diff --git a/Engine/source/T3D/physics/physicsDebris.h b/Engine/source/T3D/physics/physicsDebris.h index 48f0e4918..61a716a27 100644 --- a/Engine/source/T3D/physics/physicsDebris.h +++ b/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" diff --git a/Engine/source/T3D/physics/physicsEvents.h b/Engine/source/T3D/physics/physicsEvents.h index 9f8af4780..9be6ebe30 100644 --- a/Engine/source/T3D/physics/physicsEvents.h +++ b/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; diff --git a/Engine/source/T3D/physics/physicsForce.h b/Engine/source/T3D/physics/physicsForce.h index 41195c53a..60a37f34f 100644 --- a/Engine/source/T3D/physics/physicsForce.h +++ b/Engine/source/T3D/physics/physicsForce.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 #ifndef _T3D_PHYSICS_PHYSICSFORCE_H_ #define _T3D_PHYSICS_PHYSICSFORCE_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _T3D_PHYSICSCOMMON_H_ #include "T3D/physics/physicsCommon.h" -#endif -#ifndef _T3D_PHYSICS_PHYSICSOBJECT_H_ + #include "T3D/physics/physicsObject.h" -#endif class PhysicsBody; class PhysicsWorld; diff --git a/Engine/source/T3D/physics/physicsObject.h b/Engine/source/T3D/physics/physicsObject.h index 4bc7a38f3..2587bc746 100644 --- a/Engine/source/T3D/physics/physicsObject.h +++ b/Engine/source/T3D/physics/physicsObject.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 _T3D_PHYSICS_PHYSICSOBJECT_H_ #define _T3D_PHYSICS_PHYSICSOBJECT_H_ - -#ifndef _PHYSICS_PHYSICSUSERDATA_H_ #include "T3D/physics/physicsUserData.h" -#endif -#ifndef _UTIL_DELEGATE_H_ + #include "core/util/delegate.h" -#endif -#ifndef _REFBASE_H_ + #include "core/util/refBase.h" -#endif class PhysicsWorld; #ifndef USE_TEMPLATE_MATRIX diff --git a/Engine/source/T3D/physics/physicsPlayer.h b/Engine/source/T3D/physics/physicsPlayer.h index 97d2874fe..41bca36b7 100644 --- a/Engine/source/T3D/physics/physicsPlayer.h +++ b/Engine/source/T3D/physics/physicsPlayer.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_PHYSICSPLAYER_H_ #define _T3D_PHYSICS_PHYSICSPLAYER_H_ - -#ifndef _T3D_PHYSICS_PHYSICSOBJECT_H_ #include "T3D/physics/physicsObject.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif class CollisionList; //struct ObjectRenderInst; diff --git a/Engine/source/T3D/physics/physicsPlugin.h b/Engine/source/T3D/physics/physicsPlugin.h index bf5040941..af00df449 100644 --- a/Engine/source/T3D/physics/physicsPlugin.h +++ b/Engine/source/T3D/physics/physicsPlugin.h @@ -19,29 +19,19 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _T3D_PHYSICS_PHYSICSPLUGIN_H_ #define _T3D_PHYSICS_PHYSICSPLUGIN_H_ - -#ifndef _SIMSET_H_ #include "console/simSet.h" -#endif -#ifndef _TSIGNAL_H_ -#include "core/util/tSignal.h" -#endif -#ifndef _TORQUE_STRING_H_ -#include "core/util/str.h" -#endif -#ifndef _TDICTIONARY_H_ -#include "core/util/tDictionary.h" -#endif -#ifndef _UTIL_DELEGATE_H_ -#include "core/util/delegate.h" -#endif -#ifndef _T3D_PHYSICSCOMMON_H_ -#include "T3D/physics/physicsCommon.h" -#endif +#include "core/util/tSignal.h" +#include "core/util/str.h" + +#include "core/util/tDictionary.h" +#include "core/util/delegate.h" + +#include "T3D/physics/physicsCommon.h" class Player; class SceneRenderState; diff --git a/Engine/source/T3D/physics/physicsShape.h b/Engine/source/T3D/physics/physicsShape.h index 7c9ae7491..bc2e07154 100644 --- a/Engine/source/T3D/physics/physicsShape.h +++ b/Engine/source/T3D/physics/physicsShape.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 _PHYSICSSHAPE_H_ #define _PHYSICSSHAPE_H_ diff --git a/Engine/source/T3D/physics/physicsUserData.h b/Engine/source/T3D/physics/physicsUserData.h index 9c8b2ddab..f5375d2c1 100644 --- a/Engine/source/T3D/physics/physicsUserData.h +++ b/Engine/source/T3D/physics/physicsUserData.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 _PHYSICS_PHYSICSUSERDATA_H_ #define _PHYSICS_PHYSICSUSERDATA_H_ - -#ifndef _SIGNAL_H_ #include "core/util/tSignal.h" -#endif class PhysicsUserData; class SceneObject; diff --git a/Engine/source/T3D/physics/physicsWorld.h b/Engine/source/T3D/physics/physicsWorld.h index e03d088c5..867160c8c 100644 --- a/Engine/source/T3D/physics/physicsWorld.h +++ b/Engine/source/T3D/physics/physicsWorld.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_PHYSICSWORLD_H_ #define _T3D_PHYSICS_PHYSICSWORLD_H_ - -#ifndef _SIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif class ProcessList; class Point3F; diff --git a/Engine/source/T3D/player.h b/Engine/source/T3D/player.h index af9477fd8..bf94a86fd 100644 --- a/Engine/source/T3D/player.h +++ b/Engine/source/T3D/player.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 _PLAYER_H_ #define _PLAYER_H_ - -#ifndef _SHAPEBASE_H_ #include "T3D/shapeBase.h" -#endif -#ifndef _BOXCONVEX_H_ + #include "collision/boxConvex.h" -#endif #include "T3D/assets/SoundAsset.h" #include "T3D/gameBase/gameProcess.h" diff --git a/Engine/source/T3D/pointLight.h b/Engine/source/T3D/pointLight.h index 5287bd285..ac694b6a3 100644 --- a/Engine/source/T3D/pointLight.h +++ b/Engine/source/T3D/pointLight.h @@ -19,14 +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 _POINTLIGHT_H_ #define _POINTLIGHT_H_ - -#ifndef _LIGHTBASE_H_ #include "T3D/lightBase.h" -#endif - class PointLight : public LightBase { diff --git a/Engine/source/T3D/portal.h b/Engine/source/T3D/portal.h index 0d4aaadb8..c443d6ff9 100644 --- a/Engine/source/T3D/portal.h +++ b/Engine/source/T3D/portal.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 _PORTAL_H_ #define _PORTAL_H_ - -#ifndef _ZONE_H_ #include "T3D/zone.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - class SceneCullingState; class SceneCullingVolume; diff --git a/Engine/source/T3D/prefab.h b/Engine/source/T3D/prefab.h index 70914237b..862c32d40 100644 --- a/Engine/source/T3D/prefab.h +++ b/Engine/source/T3D/prefab.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 _PREFAB_H_ #define _PREFAB_H_ diff --git a/Engine/source/T3D/projectile.h b/Engine/source/T3D/projectile.h index cc28d00b1..1c15f0174 100644 --- a/Engine/source/T3D/projectile.h +++ b/Engine/source/T3D/projectile.h @@ -24,25 +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 _PROJECTILE_H_ #define _PROJECTILE_H_ - -#ifndef _GAMEBASE_H_ #include "T3D/gameBase/gameBase.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif -#ifndef _TSSHAPE_H_ #include "ts/tsShape.h" -#endif -#ifndef _LIGHTDESCRIPTION_H_ + #include "T3D/lightDescription.h" -#endif -#ifndef _LIGHTINFO_H_ + #include "lighting/lightInfo.h" -#endif #include "T3D/assets/SoundAsset.h" #include "T3D/assets/ShapeAsset.h" diff --git a/Engine/source/T3D/proximityMine.h b/Engine/source/T3D/proximityMine.h index e505689af..13e72196c 100644 --- a/Engine/source/T3D/proximityMine.h +++ b/Engine/source/T3D/proximityMine.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 _PROXIMITYMINE_H_ #define _PROXIMITYMINE_H_ diff --git a/Engine/source/T3D/rigid.h b/Engine/source/T3D/rigid.h index ad66c0e0c..43f56820a 100644 --- a/Engine/source/T3D/rigid.h +++ b/Engine/source/T3D/rigid.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 _RIGID_H_ #define _RIGID_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MMATRIX_H_ + #include "math/mMatrix.h" -#endif -#ifndef _MQUAT_H_ + #include "math/mQuat.h" -#endif //---------------------------------------------------------------------------- diff --git a/Engine/source/T3D/rigidShape.h b/Engine/source/T3D/rigidShape.h index 95ce0a361..7c8a8cbf3 100644 --- a/Engine/source/T3D/rigidShape.h +++ b/Engine/source/T3D/rigidShape.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 _RIGIDSHAPE_H_ #define _RIGIDSHAPE_H_ - -#ifndef _SHAPEBASE_H_ #include "T3D/shapeBase.h" -#endif -#ifndef _RIGID_H_ + #include "T3D/rigid.h" -#endif -#ifndef _BOXCONVEX_H_ + #include "collision/boxConvex.h" -#endif -#ifndef _T3D_PHYSICS_PHYSICSBODY_H_ #include "T3D/physics/physicsBody.h" -#endif #include "T3D/assets/SoundAsset.h" diff --git a/Engine/source/T3D/sfx/sfx3DWorld.h b/Engine/source/T3D/sfx/sfx3DWorld.h index 6e765b565..ae8a9e812 100644 --- a/Engine/source/T3D/sfx/sfx3DWorld.h +++ b/Engine/source/T3D/sfx/sfx3DWorld.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 _SFX3DWORLD_H_ #define _SFX3DWORLD_H_ diff --git a/Engine/source/T3D/sfx/sfxEmitter.h b/Engine/source/T3D/sfx/sfxEmitter.h index 562bb55c4..f9b2aca52 100644 --- a/Engine/source/T3D/sfx/sfxEmitter.h +++ b/Engine/source/T3D/sfx/sfxEmitter.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 _SFXEMITTER_H_ #define _SFXEMITTER_H_ diff --git a/Engine/source/T3D/sfx/sfxSpace.h b/Engine/source/T3D/sfx/sfxSpace.h index 35f0f7f52..d65f02351 100644 --- a/Engine/source/T3D/sfx/sfxSpace.h +++ b/Engine/source/T3D/sfx/sfxSpace.h @@ -19,26 +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 _SFXSPACE_H_ #define _SFXSPACE_H_ - -#ifndef _SCENESPACE_H_ #include "scene/sceneSpace.h" -#endif -#ifndef _SFXSOURCE_H_ #include "sfx/sfxSource.h" -#endif -#ifndef _SCENEAMBIENTSOUNDOBJECT_H_ #include "scene/mixin/sceneAmbientSoundObject.h" -#endif -#ifndef _SCENEPOLYHEDRALOBJECT_H_ #include "scene/mixin/scenePolyhedralObject.h" -#endif - /// A convex space that defines a custom ambient sound space. class SFXSpace : public SceneAmbientSoundObject< ScenePolyhedralObject< SceneSpace > > diff --git a/Engine/source/T3D/shapeBase.h b/Engine/source/T3D/shapeBase.h index e53ab5e1d..b5c64f6a3 100644 --- a/Engine/source/T3D/shapeBase.h +++ b/Engine/source/T3D/shapeBase.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 _SHAPEBASE_H_ #define _SHAPEBASE_H_ diff --git a/Engine/source/T3D/spotLight.h b/Engine/source/T3D/spotLight.h index c5a8f998e..6bac064d1 100644 --- a/Engine/source/T3D/spotLight.h +++ b/Engine/source/T3D/spotLight.h @@ -19,14 +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 _SPOTLIGHT_H_ #define _SPOTLIGHT_H_ - -#ifndef _LIGHTBASE_H_ #include "T3D/lightBase.h" -#endif - class SpotLight : public LightBase { diff --git a/Engine/source/T3D/staticShape.h b/Engine/source/T3D/staticShape.h index 4976758dd..9544a8b6a 100644 --- a/Engine/source/T3D/staticShape.h +++ b/Engine/source/T3D/staticShape.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 _STATICSHAPE_H_ #define _STATICSHAPE_H_ - -#ifndef _SHAPEBASE_H_ #include "T3D/shapeBase.h" -#endif //---------------------------------------------------------------------------- diff --git a/Engine/source/T3D/trigger.h b/Engine/source/T3D/trigger.h index 9b9190e67..b0e9641c9 100644 --- a/Engine/source/T3D/trigger.h +++ b/Engine/source/T3D/trigger.h @@ -22,19 +22,13 @@ #ifndef _H_TRIGGER #define _H_TRIGGER - -#ifndef _GAMEBASE_H_ #include "T3D/gameBase/gameBase.h" -#endif -#ifndef _MBOX_H_ + #include "math/mBox.h" -#endif -#ifndef _EARLYOUTPOLYLIST_H_ + #include "collision/earlyOutPolyList.h" -#endif -#ifndef _MPOLYHEDRON_H_ + #include "math/mPolyhedron.h" -#endif class Convex; class PhysicsBody; diff --git a/Engine/source/T3D/tsStatic.h b/Engine/source/T3D/tsStatic.h index 626eabb16..56a0ce30b 100644 --- a/Engine/source/T3D/tsStatic.h +++ b/Engine/source/T3D/tsStatic.h @@ -24,37 +24,27 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _TSSTATIC_H_ #define _TSSTATIC_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _CONVEX_H_ + #include "collision/convex.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif -#ifndef _NETSTRINGTABLE_H_ #include "sim/netStringTable.h" -#endif -#ifndef _TSSHAPE_H_ + #include "ts/tsShape.h" -#endif -#ifndef _REFLECTOR_H_ #include "scene/reflector.h" -#endif - -#ifndef _COLLADA_UTILS_H_ #include "ts/collada/colladaUtils.h" -#endif -#ifndef _ASSET_PTR_H_ #include "assets/assetPtr.h" -#endif + #ifndef SHAPEASSET_H #include "T3D/assets/ShapeAsset.h" #endif diff --git a/Engine/source/T3D/turret/aiTurretShape.h b/Engine/source/T3D/turret/aiTurretShape.h index ef26984c5..1c02755ea 100644 --- a/Engine/source/T3D/turret/aiTurretShape.h +++ b/Engine/source/T3D/turret/aiTurretShape.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 _AITURRETSHAPE_H_ #define _AITURRETSHAPE_H_ diff --git a/Engine/source/T3D/turret/turretShape.h b/Engine/source/T3D/turret/turretShape.h index a086d79d7..a3715e002 100644 --- a/Engine/source/T3D/turret/turretShape.h +++ b/Engine/source/T3D/turret/turretShape.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 _TURRETSHAPE_H_ #define _TURRETSHAPE_H_ diff --git a/Engine/source/T3D/vehicles/flyingVehicle.h b/Engine/source/T3D/vehicles/flyingVehicle.h index 141515e83..072a6f98c 100644 --- a/Engine/source/T3D/vehicles/flyingVehicle.h +++ b/Engine/source/T3D/vehicles/flyingVehicle.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 _FLYINGVEHICLE_H_ #define _FLYINGVEHICLE_H_ - -#ifndef _VEHICLE_H_ #include "T3D/vehicles/vehicle.h" -#endif -#ifndef _CLIPPEDPOLYLIST_H_ #include "collision/clippedPolyList.h" -#endif class ParticleEmitter; class ParticleEmitterData; diff --git a/Engine/source/T3D/vehicles/hoverVehicle.h b/Engine/source/T3D/vehicles/hoverVehicle.h index 7a3dc9941..4248fef15 100644 --- a/Engine/source/T3D/vehicles/hoverVehicle.h +++ b/Engine/source/T3D/vehicles/hoverVehicle.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 _HOVERVEHICLE_H_ #define _HOVERVEHICLE_H_ - -#ifndef _VEHICLE_H_ #include "T3D/vehicles/vehicle.h" -#endif class ParticleEmitter; class ParticleEmitterData; diff --git a/Engine/source/T3D/vehicles/vehicle.h b/Engine/source/T3D/vehicles/vehicle.h index ba7bf8e68..3aabb151a 100644 --- a/Engine/source/T3D/vehicles/vehicle.h +++ b/Engine/source/T3D/vehicles/vehicle.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 _VEHICLE_H_ #define _VEHICLE_H_ - -#ifndef _SHAPEBASE_H_ #include "T3D/rigidShape.h" -#endif #include "T3D/AI/AIController.h" diff --git a/Engine/source/T3D/vehicles/vehicleBlocker.h b/Engine/source/T3D/vehicles/vehicleBlocker.h index 85d881a19..7fd769b18 100644 --- a/Engine/source/T3D/vehicles/vehicleBlocker.h +++ b/Engine/source/T3D/vehicles/vehicleBlocker.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 _VEHICLEBLOCKER_H_ #define _VEHICLEBLOCKER_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _BOXCONVEX_H_ + #include "collision/boxConvex.h" -#endif //-------------------------------------------------------------------------- class VehicleBlocker : public SceneObject diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.h b/Engine/source/T3D/vehicles/wheeledVehicle.h index b701257f6..4644bc065 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.h +++ b/Engine/source/T3D/vehicles/wheeledVehicle.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 _WHEELEDVEHICLE_H_ #define _WHEELEDVEHICLE_H_ - -#ifndef _VEHICLE_H_ #include "T3D/vehicles/vehicle.h" -#endif -#ifndef _CLIPPEDPOLYLIST_H_ #include "collision/clippedPolyList.h" -#endif #include "T3D/assets/ShapeAsset.h" diff --git a/Engine/source/T3D/zone.h b/Engine/source/T3D/zone.h index 313923149..990f3158e 100644 --- a/Engine/source/T3D/zone.h +++ b/Engine/source/T3D/zone.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 _ZONE_H_ #define _ZONE_H_ - -#ifndef _SCENEPOLYHEDRALZONE_H_ #include "scene/zones/scenePolyhedralZone.h" -#endif -#ifndef _SCENEAMBIENTSOUNDOBJECT_H_ #include "scene/mixin/sceneAmbientSoundObject.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - /// A volume in space that encloses objects. /// diff --git a/Engine/source/afx/afxCamera.h b/Engine/source/afx/afxCamera.h index 992a2a1b2..a1c818ad8 100644 --- a/Engine/source/afx/afxCamera.h +++ b/Engine/source/afx/afxCamera.h @@ -35,13 +35,12 @@ // http://www.garagegames.com/index.php?sec=mg&mod=resource&page=view&qid=5471 // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CAMERA_H_ #define _AFX_CAMERA_H_ - -#ifndef _SHAPEBASE_H_ -#include "game/shapeBase.h" -#endif +#include "T3D/shapeBase.h" //---------------------------------------------------------------------------- struct afxCameraData: public ShapeBaseData { diff --git a/Engine/source/afx/afxChoreographer.h b/Engine/source/afx/afxChoreographer.h index 2442feef7..8cf1e7eac 100644 --- a/Engine/source/afx/afxChoreographer.h +++ b/Engine/source/afx/afxChoreographer.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CHOREOGRAPHER_H_ #define _AFX_CHOREOGRAPHER_H_ diff --git a/Engine/source/afx/afxConstraint.h b/Engine/source/afx/afxConstraint.h index aa7b94559..6d22c043f 100644 --- a/Engine/source/afx/afxConstraint.h +++ b/Engine/source/afx/afxConstraint.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CONSTRAINT_H_ #define _AFX_CONSTRAINT_H_ diff --git a/Engine/source/afx/afxEffectDefs.h b/Engine/source/afx/afxEffectDefs.h index bbcf5cef2..3e2809085 100644 --- a/Engine/source/afx/afxEffectDefs.h +++ b/Engine/source/afx/afxEffectDefs.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_EFFECT_DEFS_H_ #define _AFX_EFFECT_DEFS_H_ diff --git a/Engine/source/afx/afxEffectGroup.h b/Engine/source/afx/afxEffectGroup.h index 2c3ad480b..44350194f 100644 --- a/Engine/source/afx/afxEffectGroup.h +++ b/Engine/source/afx/afxEffectGroup.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_EFFECT_GROUP_H_ -#define _AFX_EFFECT_GROUP_H_ + +#pragma once //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// @@ -98,5 +97,4 @@ public: DECLARE_CONOBJECT(afxEffectGroupData); }; -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#endif // _AFX_EFFECT_GROUP_H_ + diff --git a/Engine/source/afx/afxEffectVector.h b/Engine/source/afx/afxEffectVector.h index 837dfe2ce..7541327e4 100644 --- a/Engine/source/afx/afxEffectVector.h +++ b/Engine/source/afx/afxEffectVector.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_EFFECT_VECTOR_H_ #define _AFX_EFFECT_VECTOR_H_ diff --git a/Engine/source/afx/afxEffectWrapper.h b/Engine/source/afx/afxEffectWrapper.h index 9d14f96ef..4a82c3c79 100644 --- a/Engine/source/afx/afxEffectWrapper.h +++ b/Engine/source/afx/afxEffectWrapper.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_EFFECT_WRAPPER_H_ #define _AFX_EFFECT_WRAPPER_H_ diff --git a/Engine/source/afx/afxEffectron.h b/Engine/source/afx/afxEffectron.h index 6391dd5dc..13e923371 100644 --- a/Engine/source/afx/afxEffectron.h +++ b/Engine/source/afx/afxEffectron.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_COMPOSITE_EFFECT_H_ #define _AFX_COMPOSITE_EFFECT_H_ diff --git a/Engine/source/afx/afxMagicMissile.h b/Engine/source/afx/afxMagicMissile.h index fcd03f7c9..33c2d68c5 100644 --- a/Engine/source/afx/afxMagicMissile.h +++ b/Engine/source/afx/afxMagicMissile.h @@ -35,6 +35,8 @@ // http://www.garagegames.com/index.php?sec=mg&mod=resource&page=view&qid=5128 // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_MAGIC_MISSILE_H_ #define _AFX_MAGIC_MISSILE_H_ diff --git a/Engine/source/afx/afxMagicSpell.h b/Engine/source/afx/afxMagicSpell.h index 7967ce1b3..d72b1c9db 100644 --- a/Engine/source/afx/afxMagicSpell.h +++ b/Engine/source/afx/afxMagicSpell.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_MAGIC_SPELL_H_ #define _AFX_MAGIC_SPELL_H_ diff --git a/Engine/source/afx/afxPhrase.h b/Engine/source/afx/afxPhrase.h index 12803dc5f..677d4cc4c 100644 --- a/Engine/source/afx/afxPhrase.h +++ b/Engine/source/afx/afxPhrase.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_PHRASE_H_ #define _AFX_PHRASE_H_ diff --git a/Engine/source/afx/afxRenderHighlightMgr.h b/Engine/source/afx/afxRenderHighlightMgr.h index 2be151543..280b3240c 100644 --- a/Engine/source/afx/afxRenderHighlightMgr.h +++ b/Engine/source/afx/afxRenderHighlightMgr.h @@ -30,13 +30,9 @@ // Supporting code mods in other areas of the engine are marked as // "(selection-highlight)". //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once -#ifndef _afxRENDERHIGHLIGHTMGR_H_ -#define _afxRENDERHIGHLIGHTMGR_H_ - -#ifndef _TEXTARGETBIN_MGR_H_ #include "renderInstance/renderTexTargetBinManager.h" -#endif class PostEffect; @@ -71,6 +67,3 @@ protected: SimObjectPtr mSelectionEffect; }; - - -#endif // _afxRENDERHIGHLIGHTMGR_H_ diff --git a/Engine/source/afx/afxResidueMgr.h b/Engine/source/afx/afxResidueMgr.h index e591a15e6..49f7a1d43 100644 --- a/Engine/source/afx/afxResidueMgr.h +++ b/Engine/source/afx/afxResidueMgr.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_RESIDUE_MGR_H_ #define _AFX_RESIDUE_MGR_H_ diff --git a/Engine/source/afx/afxSelectron.h b/Engine/source/afx/afxSelectron.h index afd68124b..2c73f03a3 100644 --- a/Engine/source/afx/afxSelectron.h +++ b/Engine/source/afx/afxSelectron.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_SELECTION_EFFECT_H_ #define _AFX_SELECTION_EFFECT_H_ diff --git a/Engine/source/afx/afxSpellBook.h b/Engine/source/afx/afxSpellBook.h index ed487c5a0..45b05fe47 100644 --- a/Engine/source/afx/afxSpellBook.h +++ b/Engine/source/afx/afxSpellBook.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_SPELL_BOOK_H_ #define _AFX_SPELL_BOOK_H_ diff --git a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h index 6ca962a71..f096f320b 100644 --- a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_GROUNDPLANE_RENDERER_H_ #define _AFX_ZODIAC_GROUNDPLANE_RENDERER_H_ diff --git a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h index 030887cc0..1a6a80580 100644 --- a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_MESHROAD_RENDERER_H_ #define _AFX_ZODIAC_MESHROAD_RENDERER_H_ diff --git a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h index 357dc34d8..e3f5a7729 100644 --- a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_POLYSOUP_RENDERER_H_ #define _AFX_ZODIAC_POLYSOUP_RENDERER_H_ diff --git a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h index e32acdf55..8d6950260 100644 --- a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h +++ b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_TERRAIN_RENDERER_H_ #define _AFX_ZODIAC_TERRAIN_RENDERER_H_ diff --git a/Engine/source/afx/arcaneFX.h b/Engine/source/afx/arcaneFX.h index 19e78d29a..180419aaf 100644 --- a/Engine/source/afx/arcaneFX.h +++ b/Engine/source/afx/arcaneFX.h @@ -22,15 +22,13 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _ARCANE_FX_H_ #define _ARCANE_FX_H_ //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif #define AFX_VERSION_STRING "2.0" #define AFX_VERSION 2.0 @@ -56,31 +54,19 @@ #endif //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// - -#ifndef _CONSOLETYPES_H_ #include "console/consoleTypes.h" -#endif -#ifndef _ENGINEAPI_H_ #include "console/engineAPI.h" -#endif -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _BITSTREAM_H_ #include "core/stream/bitStream.h" -#endif -#ifndef _GAMEBASE_H_ #include "T3D/gameBase/gameBase.h" -#endif #if defined(DGL_GRAPHICS_LAYER) -#ifndef _DGL_H_ #include "dgl/dgl.h" -#endif + #endif class afxChoreographer; diff --git a/Engine/source/afx/ce/afxAnimClip.h b/Engine/source/afx/ce/afxAnimClip.h index c7f39fff3..2a079b9c0 100644 --- a/Engine/source/afx/ce/afxAnimClip.h +++ b/Engine/source/afx/ce/afxAnimClip.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_ANIM_CLIP_H_ -#define _AFX_ANIM_CLIP_H_ + +#pragma once class afxAnimClipData : public GameBaseData { @@ -74,7 +73,3 @@ public: DECLARE_CONOBJECT(afxAnimClipData); }; - -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#endif // _AFX_ANIM_CLIP_H_ diff --git a/Engine/source/afx/ce/afxAnimLock.h b/Engine/source/afx/ce/afxAnimLock.h index 63d75b2d1..0107fd8a9 100644 --- a/Engine/source/afx/ce/afxAnimLock.h +++ b/Engine/source/afx/ce/afxAnimLock.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_ANIM_LOCK_H_ -#define _AFX_ANIM_LOCK_H_ + +#pragma once class afxAnimLockData : public GameBaseData { @@ -42,6 +41,3 @@ public: DECLARE_CONOBJECT(afxAnimLockData); }; -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#endif // _AFX_ANIM_LOCK_H_ diff --git a/Engine/source/afx/ce/afxAreaDamage.h b/Engine/source/afx/ce/afxAreaDamage.h index 2274b2b19..d975c3634 100644 --- a/Engine/source/afx/ce/afxAreaDamage.h +++ b/Engine/source/afx/ce/afxAreaDamage.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_AREA_DAMAGE_H_ -#define _AFX_AREA_DAMAGE_H_ + +#pragma once #include "afx/afxEffectDefs.h" @@ -55,7 +54,3 @@ public: DECLARE_CONOBJECT(afxAreaDamageData); }; - -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#endif // _AFX_AREA_DAMAGE_H_ diff --git a/Engine/source/afx/ce/afxAudioBank.h b/Engine/source/afx/ce/afxAudioBank.h index 67d2e8bfb..2b741c7e4 100644 --- a/Engine/source/afx/ce/afxAudioBank.h +++ b/Engine/source/afx/ce/afxAudioBank.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_AUDIO_BANK_H_ -#define _AFX_AUDIO_BANK_H_ + +#pragma once class SFXDescription; @@ -60,7 +59,3 @@ public: DECLARE_CONOBJECT(afxAudioBank); }; - -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#endif // _AFX_AUDIO_BANK_H_ diff --git a/Engine/source/afx/ce/afxBillboard.h b/Engine/source/afx/ce/afxBillboard.h index 34e278206..010b2dc06 100644 --- a/Engine/source/afx/ce/afxBillboard.h +++ b/Engine/source/afx/ce/afxBillboard.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_BILLBOARD_H_ -#define _AFX_BILLBOARD_H_ + +#pragma once #include "afx/afxEffectDefs.h" @@ -115,7 +114,3 @@ public: DECLARE_CONOBJECT(afxBillboard); DECLARE_CATEGORY("UNLISTED"); }; - -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#endif // _AFX_BILLBOARD_H_ diff --git a/Engine/source/afx/ce/afxCameraPuppet.h b/Engine/source/afx/ce/afxCameraPuppet.h index f44424079..536ab535b 100644 --- a/Engine/source/afx/ce/afxCameraPuppet.h +++ b/Engine/source/afx/ce/afxCameraPuppet.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CAMERA_PUPPET_H_ #define _AFX_CAMERA_PUPPET_H_ diff --git a/Engine/source/afx/ce/afxCameraShake.h b/Engine/source/afx/ce/afxCameraShake.h index b0aa63370..fea8d22a2 100644 --- a/Engine/source/afx/ce/afxCameraShake.h +++ b/Engine/source/afx/ce/afxCameraShake.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CAMERA_SHAKE_H_ #define _AFX_CAMERA_SHAKE_H_ diff --git a/Engine/source/afx/ce/afxCollisionEvent.h b/Engine/source/afx/ce/afxCollisionEvent.h index ee7b7d475..6b5703503 100644 --- a/Engine/source/afx/ce/afxCollisionEvent.h +++ b/Engine/source/afx/ce/afxCollisionEvent.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_COLLISION_EVENT_H_ #define _AFX_COLLISION_EVENT_H_ diff --git a/Engine/source/afx/ce/afxComponentEffect.h b/Engine/source/afx/ce/afxComponentEffect.h index 5491b7891..913189d9e 100644 --- a/Engine/source/afx/ce/afxComponentEffect.h +++ b/Engine/source/afx/ce/afxComponentEffect.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_COMPONENT_EFFECT_H_ #define _AFX_COMPONENT_EFFECT_H_ diff --git a/Engine/source/afx/ce/afxConsoleMessage.h b/Engine/source/afx/ce/afxConsoleMessage.h index ad95d5918..a36d60ebb 100644 --- a/Engine/source/afx/ce/afxConsoleMessage.h +++ b/Engine/source/afx/ce/afxConsoleMessage.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CONSOLE_MESSAGE_H_ #define _AFX_CONSOLE_MESSAGE_H_ diff --git a/Engine/source/afx/ce/afxDamage.h b/Engine/source/afx/ce/afxDamage.h index d42fd772d..a6ae986dc 100644 --- a/Engine/source/afx/ce/afxDamage.h +++ b/Engine/source/afx/ce/afxDamage.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_DAMAGE_H_ #define _AFX_DAMAGE_H_ diff --git a/Engine/source/afx/ce/afxFootSwitch.h b/Engine/source/afx/ce/afxFootSwitch.h index f1c8484ad..e9ab7cddd 100644 --- a/Engine/source/afx/ce/afxFootSwitch.h +++ b/Engine/source/afx/ce/afxFootSwitch.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_FOOT_SWITCH_H_ -#define _AFX_FOOT_SWITCH_H_ + +#pragma once class afxFootSwitchData : public GameBaseData { @@ -51,5 +50,3 @@ public: }; //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#endif // _AFX_FOOT_SWITCH_H_ diff --git a/Engine/source/afx/ce/afxGuiController.h b/Engine/source/afx/ce/afxGuiController.h index 1c1cf8ffa..d868338eb 100644 --- a/Engine/source/afx/ce/afxGuiController.h +++ b/Engine/source/afx/ce/afxGuiController.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_GUI_CONTROLLER_H_ #define _AFX_GUI_CONTROLLER_H_ diff --git a/Engine/source/afx/ce/afxGuiText.h b/Engine/source/afx/ce/afxGuiText.h index f4e29676f..08de45ba7 100644 --- a/Engine/source/afx/ce/afxGuiText.h +++ b/Engine/source/afx/ce/afxGuiText.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_GUI_TEXT_H_ #define _AFX_GUI_TEXT_H_ diff --git a/Engine/source/afx/ce/afxLight.h b/Engine/source/afx/ce/afxLight.h index 84e2bd1cd..28c911922 100644 --- a/Engine/source/afx/ce/afxLight.h +++ b/Engine/source/afx/ce/afxLight.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_LIGHT_H_ #define _AFX_LIGHT_H_ diff --git a/Engine/source/afx/ce/afxLightBase_T3D.h b/Engine/source/afx/ce/afxLightBase_T3D.h index 3f101b1d7..e441c478d 100644 --- a/Engine/source/afx/ce/afxLightBase_T3D.h +++ b/Engine/source/afx/ce/afxLightBase_T3D.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_T3D_LIGHT_BASE_H_ #define _AFX_T3D_LIGHT_BASE_H_ diff --git a/Engine/source/afx/ce/afxMachineGun.h b/Engine/source/afx/ce/afxMachineGun.h index 925e8b8fc..420e63b7b 100644 --- a/Engine/source/afx/ce/afxMachineGun.h +++ b/Engine/source/afx/ce/afxMachineGun.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_MACHINE_GUN_H_ #define _AFX_MACHINE_GUN_H_ diff --git a/Engine/source/afx/ce/afxModel.h b/Engine/source/afx/ce/afxModel.h index b57683731..491eb8a31 100644 --- a/Engine/source/afx/ce/afxModel.h +++ b/Engine/source/afx/ce/afxModel.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_MODEL_H_ #define _AFX_MODEL_H_ diff --git a/Engine/source/afx/ce/afxMooring.h b/Engine/source/afx/ce/afxMooring.h index 34b3b7eff..0474e0f07 100644 --- a/Engine/source/afx/ce/afxMooring.h +++ b/Engine/source/afx/ce/afxMooring.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_MOORING_H_ #define _AFX_MOORING_H_ diff --git a/Engine/source/afx/ce/afxMultiLight.h b/Engine/source/afx/ce/afxMultiLight.h index f6bae942f..344e92a0e 100644 --- a/Engine/source/afx/ce/afxMultiLight.h +++ b/Engine/source/afx/ce/afxMultiLight.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_MULTI_LIGHT_H_ #define _AFX_MULTI_LIGHT_H_ diff --git a/Engine/source/afx/ce/afxParticleEmitter.h b/Engine/source/afx/ce/afxParticleEmitter.h index 25b377ad0..cef8c445a 100644 --- a/Engine/source/afx/ce/afxParticleEmitter.h +++ b/Engine/source/afx/ce/afxParticleEmitter.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_EMITTER_PARTICLE_H_ #define _AFX_EMITTER_PARTICLE_H_ diff --git a/Engine/source/afx/ce/afxPhraseEffect.h b/Engine/source/afx/ce/afxPhraseEffect.h index bac8bf27a..2f44e65eb 100644 --- a/Engine/source/afx/ce/afxPhraseEffect.h +++ b/Engine/source/afx/ce/afxPhraseEffect.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_PHRASE_EFFECT_H_ #define _AFX_PHRASE_EFFECT_H_ diff --git a/Engine/source/afx/ce/afxPhysicalZone.h b/Engine/source/afx/ce/afxPhysicalZone.h index 19165c9d0..68f2218fd 100644 --- a/Engine/source/afx/ce/afxPhysicalZone.h +++ b/Engine/source/afx/ce/afxPhysicalZone.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_PHYSICAL_ZONE_H_ #define _AFX_PHYSICAL_ZONE_H_ diff --git a/Engine/source/afx/ce/afxPlayerMovement.h b/Engine/source/afx/ce/afxPlayerMovement.h index 512542b6f..c3a6eb69c 100644 --- a/Engine/source/afx/ce/afxPlayerMovement.h +++ b/Engine/source/afx/ce/afxPlayerMovement.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_PLAYER_MOVEMENT_H_ #define _AFX_PLAYER_MOVEMENT_H_ diff --git a/Engine/source/afx/ce/afxPlayerPuppet.h b/Engine/source/afx/ce/afxPlayerPuppet.h index f3cabe4aa..b86521dd5 100644 --- a/Engine/source/afx/ce/afxPlayerPuppet.h +++ b/Engine/source/afx/ce/afxPlayerPuppet.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_PLAYER_PUPPET_H_ #define _AFX_PLAYER_PUPPET_H_ diff --git a/Engine/source/afx/ce/afxPointLight_T3D.h b/Engine/source/afx/ce/afxPointLight_T3D.h index bccd5abbe..1e1cf3613 100644 --- a/Engine/source/afx/ce/afxPointLight_T3D.h +++ b/Engine/source/afx/ce/afxPointLight_T3D.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_T3D_POINT_LIGHT_H_ #define _AFX_T3D_POINT_LIGHT_H_ diff --git a/Engine/source/afx/ce/afxProjectile.h b/Engine/source/afx/ce/afxProjectile.h index 19da1548f..5c4f051d2 100644 --- a/Engine/source/afx/ce/afxProjectile.h +++ b/Engine/source/afx/ce/afxProjectile.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_PROJECTILE_H_ #define _AFX_PROJECTILE_H_ diff --git a/Engine/source/afx/ce/afxScriptEvent.h b/Engine/source/afx/ce/afxScriptEvent.h index b917f0747..ddc9bfddf 100644 --- a/Engine/source/afx/ce/afxScriptEvent.h +++ b/Engine/source/afx/ce/afxScriptEvent.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_SCRIPT_EVENT_H_ #define _AFX_SCRIPT_EVENT_H_ diff --git a/Engine/source/afx/ce/afxSpotLight_T3D.h b/Engine/source/afx/ce/afxSpotLight_T3D.h index a7102be94..a4e4fa01d 100644 --- a/Engine/source/afx/ce/afxSpotLight_T3D.h +++ b/Engine/source/afx/ce/afxSpotLight_T3D.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_T3D_SPOT_LIGHT_H_ #define _AFX_T3D_SPOT_LIGHT_H_ diff --git a/Engine/source/afx/ce/afxStaticShape.h b/Engine/source/afx/ce/afxStaticShape.h index ea31a2383..df8fa6b0e 100644 --- a/Engine/source/afx/ce/afxStaticShape.h +++ b/Engine/source/afx/ce/afxStaticShape.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_STATIC_SHAPE_H_ #define _AFX_STATIC_SHAPE_H_ diff --git a/Engine/source/afx/ce/afxVolumeLight.h b/Engine/source/afx/ce/afxVolumeLight.h index c74ce7f95..890771ab1 100644 --- a/Engine/source/afx/ce/afxVolumeLight.h +++ b/Engine/source/afx/ce/afxVolumeLight.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_VOLUME_LIGHT_H_ #define _AFX_VOLUME_LIGHT_H_ diff --git a/Engine/source/afx/ce/afxZodiac.h b/Engine/source/afx/ce/afxZodiac.h index 501dfc034..7a2449932 100644 --- a/Engine/source/afx/ce/afxZodiac.h +++ b/Engine/source/afx/ce/afxZodiac.h @@ -22,16 +22,13 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_H_ #define _AFX_ZODIAC_H_ - -#ifndef _ARCANE_FX_H_ #include "afx/arcaneFX.h" -#endif -#ifndef _AFX_ZODIAC_DEFS_H_ + #include "afx/ce/afxZodiacDefs.h" -#endif #include "console/typeValidators.h" diff --git a/Engine/source/afx/ce/afxZodiacDefs.h b/Engine/source/afx/ce/afxZodiacDefs.h index 1222ca69e..03a994eb4 100644 --- a/Engine/source/afx/ce/afxZodiacDefs.h +++ b/Engine/source/afx/ce/afxZodiacDefs.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_DEFS_H_ #define _AFX_ZODIAC_DEFS_H_ diff --git a/Engine/source/afx/ce/afxZodiacMgr.h b/Engine/source/afx/ce/afxZodiacMgr.h index a243482ba..a3f822902 100644 --- a/Engine/source/afx/ce/afxZodiacMgr.h +++ b/Engine/source/afx/ce/afxZodiacMgr.h @@ -22,19 +22,15 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_MGR_H_ #define _AFX_ZODIAC_MGR_H_ - -#ifndef _ARCANE_FX_H_ #include "afx/arcaneFX.h" -#endif -#ifndef _AFX_ZODIAC_DEFS_H_ + #include "afx/ce/afxZodiacDefs.h" -#endif -#ifndef _AFX_ZODIAC_H_ + #include "afx/ce/afxZodiac.h" -#endif //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ce/afxZodiacPlane.h b/Engine/source/afx/ce/afxZodiacPlane.h index 9e7cef512..aae1d86b7 100644 --- a/Engine/source/afx/ce/afxZodiacPlane.h +++ b/Engine/source/afx/ce/afxZodiacPlane.h @@ -22,15 +22,13 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_ZODIAC_PLANE_H_ #define _AFX_ZODIAC_PLANE_H_ #include "afx/ce/afxZodiacDefs.h" - -#ifndef _AFX_ZODIAC_H_ #include "afx/ce/afxZodiac.h" -#endif class afxZodiacPlaneData : public GameBaseData, public afxZodiacDefs { diff --git a/Engine/source/afx/ea/afxEA_ParticleEmitter.h b/Engine/source/afx/ea/afxEA_ParticleEmitter.h index a0e403a21..cfd02d079 100644 --- a/Engine/source/afx/ea/afxEA_ParticleEmitter.h +++ b/Engine/source/afx/ea/afxEA_ParticleEmitter.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_EA_PARTICLE_EMITTER_H_ #define _AFX_EA_PARTICLE_EMITTER_H_ diff --git a/Engine/source/afx/forces/afxForce.h b/Engine/source/afx/forces/afxForce.h index 0e8960bc7..eaa38905d 100644 --- a/Engine/source/afx/forces/afxForce.h +++ b/Engine/source/afx/forces/afxForce.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_FORCE_H_ #define _AFX_FORCE_H_ diff --git a/Engine/source/afx/forces/afxForceSet.h b/Engine/source/afx/forces/afxForceSet.h index 7c0cabc54..1c68219d8 100644 --- a/Engine/source/afx/forces/afxForceSet.h +++ b/Engine/source/afx/forces/afxForceSet.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_FORCE_SET_H_ #define _AFX_FORCE_SET_H_ diff --git a/Engine/source/afx/rpg/afxRPGMagicSpell.h b/Engine/source/afx/rpg/afxRPGMagicSpell.h index a4c9fffd4..4bafbd9f5 100644 --- a/Engine/source/afx/rpg/afxRPGMagicSpell.h +++ b/Engine/source/afx/rpg/afxRPGMagicSpell.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_RPG_MAGIC_SPELL_H_ #define _AFX_RPG_MAGIC_SPELL_H_ diff --git a/Engine/source/afx/ui/afxGuiSubstitutionField.h b/Engine/source/afx/ui/afxGuiSubstitutionField.h index bcb69ffd3..439b1f9db 100644 --- a/Engine/source/afx/ui/afxGuiSubstitutionField.h +++ b/Engine/source/afx/ui/afxGuiSubstitutionField.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_GUI_SUBSTITUTION_FIELD_H_ #define _AFX_GUI_SUBSTITUTION_FIELD_H_ diff --git a/Engine/source/afx/ui/afxGuiTextHud.h b/Engine/source/afx/ui/afxGuiTextHud.h index 5844b61af..af35c6b7b 100644 --- a/Engine/source/afx/ui/afxGuiTextHud.h +++ b/Engine/source/afx/ui/afxGuiTextHud.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_GUI_TEXT_HUD_H_ #define _AFX_GUI_TEXT_HUD_H_ diff --git a/Engine/source/afx/ui/afxProgressBase.h b/Engine/source/afx/ui/afxProgressBase.h index 70f777002..f6b3e83fe 100644 --- a/Engine/source/afx/ui/afxProgressBase.h +++ b/Engine/source/afx/ui/afxProgressBase.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_PROGRESS_BASE_H_ #define _AFX_PROGRESS_BASE_H_ diff --git a/Engine/source/afx/ui/afxSpellButton.h b/Engine/source/afx/ui/afxSpellButton.h index 5999395b0..cb628690c 100644 --- a/Engine/source/afx/ui/afxSpellButton.h +++ b/Engine/source/afx/ui/afxSpellButton.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_SPELL_BUTTON_H_ #define _AFX_SPELL_BUTTON_H_ diff --git a/Engine/source/afx/ui/afxStatusBox.h b/Engine/source/afx/ui/afxStatusBox.h index a10c0c550..42851ee3f 100644 --- a/Engine/source/afx/ui/afxStatusBox.h +++ b/Engine/source/afx/ui/afxStatusBox.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_STATUS_BOX_H_ #define _AFX_STATUS_BOX_H_ diff --git a/Engine/source/afx/ui/afxStatusLabel.h b/Engine/source/afx/ui/afxStatusLabel.h index b8e37df52..01dc262e6 100644 --- a/Engine/source/afx/ui/afxStatusLabel.h +++ b/Engine/source/afx/ui/afxStatusLabel.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_STATUS_LABEL_H_ #define _AFX_STATUS_LABEL_H_ diff --git a/Engine/source/afx/ui/afxTSCtrl.h b/Engine/source/afx/ui/afxTSCtrl.h index b51672938..b83a1ef43 100644 --- a/Engine/source/afx/ui/afxTSCtrl.h +++ b/Engine/source/afx/ui/afxTSCtrl.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_TS_CTRL_H_ #define _AFX_TS_CTRL_H_ diff --git a/Engine/source/afx/util/afxAnimCurve.h b/Engine/source/afx/util/afxAnimCurve.h index 6ed7dbfd0..06630918d 100644 --- a/Engine/source/afx/util/afxAnimCurve.h +++ b/Engine/source/afx/util/afxAnimCurve.h @@ -22,9 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#ifndef _AFX_ANIM_CURVE_H_ -#define _AFX_ANIM_CURVE_H_ + +#pragma once #include "core/util/tVector.h" @@ -76,7 +75,3 @@ class afxAnimCurve Point2F computeTangentK0( Point2F &k0, Point2F &k1, int start_index ); Point2F computeTangentK1( Point2F &k0, Point2F &k1, int end_index ); }; - -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// - -#endif // _AFX_ANIM_CURVE_H_ \ No newline at end of file diff --git a/Engine/source/afx/util/afxCurve3D.h b/Engine/source/afx/util/afxCurve3D.h index 5ddfdfecf..1a692c5f2 100644 --- a/Engine/source/afx/util/afxCurve3D.h +++ b/Engine/source/afx/util/afxCurve3D.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CURVE_3D_H_ #define _AFX_CURVE_3D_H_ diff --git a/Engine/source/afx/util/afxCurveEval.h b/Engine/source/afx/util/afxCurveEval.h index 9df9cb92d..8ec02c807 100644 --- a/Engine/source/afx/util/afxCurveEval.h +++ b/Engine/source/afx/util/afxCurveEval.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_CURVE_EVAL_BASE_H_ #define _AFX_CURVE_EVAL_BASE_H_ diff --git a/Engine/source/afx/util/afxEase.h b/Engine/source/afx/util/afxEase.h index 80b6d95af..de2b02973 100644 --- a/Engine/source/afx/util/afxEase.h +++ b/Engine/source/afx/util/afxEase.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_EASE_H_ #define _AFX_EASE_H_ diff --git a/Engine/source/afx/util/afxParticlePool.h b/Engine/source/afx/util/afxParticlePool.h index 0bdab03c0..075c004b3 100644 --- a/Engine/source/afx/util/afxParticlePool.h +++ b/Engine/source/afx/util/afxParticlePool.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_PARTICLE_POOL_H_ #define _AFX_PARTICLE_POOL_H_ diff --git a/Engine/source/afx/util/afxPath.h b/Engine/source/afx/util/afxPath.h index 3eefdaea7..430eddc96 100644 --- a/Engine/source/afx/util/afxPath.h +++ b/Engine/source/afx/util/afxPath.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_PATH_H_ #define _AFX_PATH_H_ diff --git a/Engine/source/afx/util/afxPath3D.h b/Engine/source/afx/util/afxPath3D.h index 9c01767b6..c26bc9045 100644 --- a/Engine/source/afx/util/afxPath3D.h +++ b/Engine/source/afx/util/afxPath3D.h @@ -22,6 +22,8 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// + +#pragma once #ifndef _AFX_PATH3D_UTIL_H_ #define _AFX_PATH3D_UTIL_H_ diff --git a/Engine/source/afx/util/afxTriBoxCheck2D_T3D.h b/Engine/source/afx/util/afxTriBoxCheck2D_T3D.h index 34b64adea..c8bdfe336 100644 --- a/Engine/source/afx/util/afxTriBoxCheck2D_T3D.h +++ b/Engine/source/afx/util/afxTriBoxCheck2D_T3D.h @@ -28,11 +28,12 @@ //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //----------------------------------------------------------------------------- -// AABB-triangle overlap test code originally by Tomas Akenine-Möller +// AABB-triangle overlap test code originally by Tomas Akenine-Möller // Assisted by Pierre Terdiman and David Hunt // http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/ // Ported to TSE by BJG, 2005-4-14 //----------------------------------------------------------------------------- +#pragma once #ifndef _AFX_TRIBOXCHECK_2D_H_ #define _AFX_TRIBOXCHECK_2D_H_ diff --git a/Engine/source/afx/xm/afxXM_WaveBase.h b/Engine/source/afx/xm/afxXM_WaveBase.h index 6d4f37982..aeff2e464 100644 --- a/Engine/source/afx/xm/afxXM_WaveBase.h +++ b/Engine/source/afx/xm/afxXM_WaveBase.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_XFM_WAVE_BASE_H_ #define _AFX_XFM_WAVE_BASE_H_ diff --git a/Engine/source/afx/xm/afxXfmMod.h b/Engine/source/afx/xm/afxXfmMod.h index 355f70659..bde03a680 100644 --- a/Engine/source/afx/xm/afxXfmMod.h +++ b/Engine/source/afx/xm/afxXfmMod.h @@ -22,6 +22,7 @@ // IN THE SOFTWARE. // //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _AFX_XFM_MOD_BASE_H_ #define _AFX_XFM_MOD_BASE_H_ diff --git a/Engine/source/app/auth.h b/Engine/source/app/auth.h index 2eb76c192..878d3d876 100644 --- a/Engine/source/app/auth.h +++ b/Engine/source/app/auth.h @@ -19,9 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _AUTH_H_ -#define _AUTH_H_ +#pragma once /// Formerly contained a certificate, showing that something was valid. class Auth2Certificate @@ -51,5 +49,3 @@ inline bool validateAuthenticatedClient() { return true; } - -#endif diff --git a/Engine/source/app/banList.h b/Engine/source/app/banList.h index 35d888114..0e931693a 100644 --- a/Engine/source/app/banList.h +++ b/Engine/source/app/banList.h @@ -19,16 +19,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _BANLIST_H_ -#define _BANLIST_H_ - -#ifndef _ENGINEAPI_H_ - #include "console/engineAPI.h" -#endif -#ifndef _TVECTOR_H_ - #include "core/util/tVector.h" -#endif +#include "console/engineAPI.h" +#include "core/util/tVector.h" /// Helper class to keep track of bans. class BanList @@ -64,4 +58,3 @@ class BanList void exportToFile(const char *fileName); }; -#endif diff --git a/Engine/source/app/game.h b/Engine/source/app/game.h index 814c32a28..c55336d67 100644 --- a/Engine/source/app/game.h +++ b/Engine/source/app/game.h @@ -19,13 +19,9 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _GAME_H_ -#define _GAME_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif /// Processes the next frame, including gui, rendering, and tick interpolation. /// This function will only have an effect when executed on the client. @@ -33,5 +29,3 @@ bool clientProcess(U32 timeDelta); /// Processes the next cycle on the server. This function will only have an effect when executed on the server. bool serverProcess(U32 timeDelta); - -#endif diff --git a/Engine/source/app/mainLoop.h b/Engine/source/app/mainLoop.h index 1f72abce4..a179698a1 100644 --- a/Engine/source/app/mainLoop.h +++ b/Engine/source/app/mainLoop.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 _APP_MAINLOOP_H_ #define _APP_MAINLOOP_H_ diff --git a/Engine/source/app/net/net.h b/Engine/source/app/net/net.h index 92d39f79f..7b7a664ce 100644 --- a/Engine/source/app/net/net.h +++ b/Engine/source/app/net/net.h @@ -1,5 +1,4 @@ -#ifndef _NET_H_ -#define _NET_H_ +#pragma once #include "platform/platform.h" #include "core/dnet.h" @@ -55,5 +54,3 @@ public: DECLARE_CONOBJECT(RemoteCommandEvent); }; - -#endif \ No newline at end of file diff --git a/Engine/source/app/net/serverQuery.h b/Engine/source/app/net/serverQuery.h index fcdcaa6c1..df675092e 100644 --- a/Engine/source/app/net/serverQuery.h +++ b/Engine/source/app/net/serverQuery.h @@ -19,17 +19,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _SERVERQUERY_H_ -#define _SERVERQUERY_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _BITSET_H_ #include "core/bitSet.h" -#endif - #include "platform/platformNet.h" //----------------------------------------------------------------------------- @@ -121,5 +114,3 @@ extern void sendHeartbeat( U8 flags ); #ifdef TORQUE_DEBUG extern void addFakeServers( S32 howMany ); #endif // DEBUG - -#endif diff --git a/Engine/source/app/net/tcpObject.h b/Engine/source/app/net/tcpObject.h index 036fbea59..086f9d6f3 100644 --- a/Engine/source/app/net/tcpObject.h +++ b/Engine/source/app/net/tcpObject.h @@ -19,14 +19,9 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _TCPOBJECT_H_ -#define _TCPOBJECT_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif - #include "platform/platformNet.h" class TCPObject : public SimObject @@ -101,6 +96,3 @@ public: DECLARE_CONOBJECT(TCPObject); }; - - -#endif // _H_TCPOBJECT_ diff --git a/Engine/source/app/version.h b/Engine/source/app/version.h index 8e5bf30ce..c309f2c57 100644 --- a/Engine/source/app/version.h +++ b/Engine/source/app/version.h @@ -19,9 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _VERSION_H_ -#define _VERSION_H_ +#pragma once /// Since we can build different engine "products" out of the same /// base engine source we need a way to differentiate which product @@ -59,5 +57,3 @@ const char* getCompileTimeString(); U32 getAppVersionNumber(); /// Gets the human readable application version string. const char* getAppVersionString(); - -#endif diff --git a/Engine/source/assets/assetBase.h b/Engine/source/assets/assetBase.h index e976fc2ab..07a0a10d0 100644 --- a/Engine/source/assets/assetBase.h +++ b/Engine/source/assets/assetBase.h @@ -19,20 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _ASSET_BASE_H_ #define _ASSET_BASE_H_ - -#ifndef _ASSET_DEFINITION_H_ #include "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 //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/assetDefinition.h b/Engine/source/assets/assetDefinition.h index 1a2a2ba1b..ec224f854 100644 --- a/Engine/source/assets/assetDefinition.h +++ b/Engine/source/assets/assetDefinition.h @@ -19,29 +19,19 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _ASSET_DEFINITION_H_ #define _ASSET_DEFINITION_H_ - -#ifndef _STRINGTABLE_H_ #include "core/stringTable.h" -#endif -#ifndef _STRINGUNIT_H_ #include "core/strings/stringUnit.h" -#endif -#ifndef _SIM_H_ #include "console/sim.h" -#endif -#ifndef _SIMSET_H_ #include "console/simSet.h" -#endif -#ifndef _CONSOLEOBJECT_H_ #include "console/consoleObject.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/assetFieldTypes.cpp b/Engine/source/assets/assetFieldTypes.cpp index 242cc23e0..da0712fd5 100644 --- a/Engine/source/assets/assetFieldTypes.cpp +++ b/Engine/source/assets/assetFieldTypes.cpp @@ -37,7 +37,7 @@ #endif*/ #ifndef _STRINGUNIT_H_ -#include "string/stringUnit.h" +#include "core/strings/stringUnit.h" #endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/assetFieldTypes.h b/Engine/source/assets/assetFieldTypes.h index af76682f4..88e93c997 100644 --- a/Engine/source/assets/assetFieldTypes.h +++ b/Engine/source/assets/assetFieldTypes.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 _ASSET_FIELD_TYPES_H_ #define _ASSET_FIELD_TYPES_H_ - -#ifndef _CONSOLE_BASE_TYPE_H_ #include "console/consoleTypes.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/assetManager.h b/Engine/source/assets/assetManager.h index ed915ccbb..2623581ac 100644 --- a/Engine/source/assets/assetManager.h +++ b/Engine/source/assets/assetManager.h @@ -19,49 +19,26 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _ASSET_MANAGER_H_ -#define _ASSET_MANAGER_H_ - -#ifndef _SIMBASE_H_ #include "console/sim.h" -#endif -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif -#ifndef _MODULE_DEFINITION_H #include "module/moduleDefinition.h" -#endif - -#ifndef _MODULE_CALLBACKS_H_ #include "module/moduleCallbacks.h" -#endif -#ifndef _ASSET_BASE_H_ #include "assets/assetBase.h" -#endif -#ifndef _ASSET_DEFINITION_H_ #include "assets/assetDefinition.h" -#endif -#ifndef _ASSET_TAGS_MANIFEST_H_ #include "assets/assetTagsManifest.h" -#endif -#ifndef _ASSET_QUERY_H_ #include "assets/assetQuery.h" -#endif -#ifndef _ASSET_FIELD_TYPES_H_ #include "assets/assetFieldTypes.h" -#endif -#ifndef _NETCONNECTION_H_ #include "sim/netConnection.h" -#endif // Debug Profiling. #include "platform/profiler.h" @@ -448,4 +425,3 @@ private: extern AssetManager AssetDatabase; -#endif // _ASSET_MANAGER_H_ diff --git a/Engine/source/assets/assetPtr.h b/Engine/source/assets/assetPtr.h index 4271d0df9..289c64311 100644 --- a/Engine/source/assets/assetPtr.h +++ b/Engine/source/assets/assetPtr.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 _ASSET_PTR_H_ #define _ASSET_PTR_H_ - -#ifndef _ASSET_MANAGER_H_ #include "assetManager.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/assetQuery.h b/Engine/source/assets/assetQuery.h index b3d4879a2..f993b0361 100644 --- a/Engine/source/assets/assetQuery.h +++ b/Engine/source/assets/assetQuery.h @@ -19,25 +19,16 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _ASSET_QUERY_H_ #define _ASSET_QUERY_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _STRINGUNIT_H_ #include "core/strings/stringUnit.h" -#endif - -#ifndef _TAML_CUSTOM_H_ #include "persistence/taml/tamlCustom.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/assetQuery_ScriptBinding.h b/Engine/source/assets/assetQuery_ScriptBinding.h index 71cc58f1a..957442a5f 100644 --- a/Engine/source/assets/assetQuery_ScriptBinding.h +++ b/Engine/source/assets/assetQuery_ScriptBinding.h @@ -1,4 +1,4 @@ -//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- // Copyright (c) 2013 GarageGames, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -19,10 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _ASSET_QUERY_H_ #include "assets/assetQuery.h" -#endif #include "console/engineAPI.h" diff --git a/Engine/source/assets/assetTagsManifest.h b/Engine/source/assets/assetTagsManifest.h index 113965b30..88393936d 100644 --- a/Engine/source/assets/assetTagsManifest.h +++ b/Engine/source/assets/assetTagsManifest.h @@ -19,25 +19,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _ASSET_TAGS_MANIFEST_H_ #define _ASSET_TAGS_MANIFEST_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tvector.h" -#endif -#ifndef _STRINGUNIT_H_ #include "core/strings/stringUnit.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/autoloadAssets.h b/Engine/source/assets/autoloadAssets.h index 5a33e57c1..91f8b3bdd 100644 --- a/Engine/source/assets/autoloadAssets.h +++ b/Engine/source/assets/autoloadAssets.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _AUTOLOAD_ASSETS_H_ #define _AUTOLOAD_ASSETS_H_ - -#ifndef _SIM_H_ #include "console/sim.h" -#endif -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _CONSOLEOBJECT_H_ #include "console/consoleObject.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/core.h b/Engine/source/assets/core.h index a9803396b..89e7e308a 100644 --- a/Engine/source/assets/core.h +++ b/Engine/source/assets/core.h @@ -1,12 +1,8 @@ +#pragma once #ifndef _ASSET_CORE_H_ #define _ASSET_CORE_H_ - -#ifndef _ASSET_BASE_H_ #include "assetBase.h" -#endif -#ifndef _ASSET_DEFINITION_H_ #include "assetDefinition.h" -#endif #endif \ No newline at end of file diff --git a/Engine/source/assets/declaredAssets.h b/Engine/source/assets/declaredAssets.h index 44d6ea2a2..18be1d903 100644 --- a/Engine/source/assets/declaredAssets.h +++ b/Engine/source/assets/declaredAssets.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _DECLARED_ASSETS_H_ #define _DECLARED_ASSETS_H_ - -#ifndef _SIM_H_ #include "console/sim.h" -#endif -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _CONSOLEOBJECT_H_ #include "console/consoleObject.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/referencedAssets.h b/Engine/source/assets/referencedAssets.h index 34053bc32..a3000533a 100644 --- a/Engine/source/assets/referencedAssets.h +++ b/Engine/source/assets/referencedAssets.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _REFERENCED_ASSETS_H_ #define _REFERENCED_ASSETS_H_ - -#ifndef _SIM_H_ #include "console/sim.h" -#endif -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _CONSOLEOBJECT_H_ #include "console/consoleObject.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h b/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h index 69be7e840..25c1b8df0 100644 --- a/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h +++ b/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_ASSET_DECLARED_UPDATE_VISITOR_H_ #define _TAML_ASSET_DECLARED_UPDATE_VISITOR_H_ - -#ifndef _TAML_VISITOR_H_ #include "persistence/taml/tamlVisitor.h" -#endif -#ifndef _TAML_PARSER_H_ -#include "persistence\/taml/tamlParser.h" -#endif +#include "persistence/taml/tamlParser.h" -#ifndef _ASSET_FIELD_TYPES_H_ #include "assets/assetFieldTypes.h" -#endif // Debug Profiling. #include "platform/profiler.h" diff --git a/Engine/source/assets/tamlAssetDeclaredVisitor.h b/Engine/source/assets/tamlAssetDeclaredVisitor.h index dd768034a..5641a9392 100644 --- a/Engine/source/assets/tamlAssetDeclaredVisitor.h +++ b/Engine/source/assets/tamlAssetDeclaredVisitor.h @@ -19,29 +19,19 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_ASSET_DECLARED_VISITOR_H_ #define _TAML_ASSET_DECLARED_VISITOR_H_ - -#ifndef _TAML_VISITOR_H_ #include "persistence/taml/tamlVisitor.h" -#endif -#ifndef _TAML_PARSER_H_ -#include "persistence\/taml/tamlParser.h" -#endif +#include "persistence/taml/tamlParser.h" -#ifndef _ASSET_FIELD_TYPES_H_ #include "assets/assetFieldTypes.h" -#endif -#ifndef _ASSET_DEFINITION_H_ #include "assetDefinition.h" -#endif -#ifndef _ASSET_BASE_H_ #include "assetBase.h" -#endif // Debug Profiling. #include "platform/profiler.h" diff --git a/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h b/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h index a30d95808..69395bc84 100644 --- a/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h +++ b/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h @@ -19,29 +19,18 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_ASSET_REFERENCED_UPDATE_VISITOR_H_ #define _TAML_ASSET_REFERENCED_UPDATE_VISITOR_H_ - -#ifndef _TAML_VISITOR_H_ #include "persistence/taml/tamlVisitor.h" -#endif -#ifndef _TAML_PARSER_H_ -#include "persistence\/taml/tamlParser.h" -#endif +#include "persistence/taml/tamlParser.h" -#ifndef _STRINGUNIT_H_ -#include "string/stringUnit.h" -#endif +#include "core/strings/stringUnit.h" -#ifndef _STRINGTABLE_H_ -#include "string/stringTable.h" -#endif - -#ifndef _ASSET_FIELD_TYPES_H_ +#include "core/stringTable.h" #include "assets/assetFieldTypes.h" -#endif // Debug Profiling. #include "platform/profiler.h" diff --git a/Engine/source/assets/tamlAssetReferencedVisitor.h b/Engine/source/assets/tamlAssetReferencedVisitor.h index 49c972ea9..b30f2b856 100644 --- a/Engine/source/assets/tamlAssetReferencedVisitor.h +++ b/Engine/source/assets/tamlAssetReferencedVisitor.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_ASSET_REFERENCED_VISITOR_H_ #define _TAML_ASSET_REFERENCED_VISITOR_H_ - -#ifndef _TAML_VISITOR_H_ #include "persistence/taml/tamlVisitor.h" -#endif -#ifndef _TAML_PARSER_H_ #include "persistence/taml/tamlParser.h" -#endif -#ifndef _ASSET_FIELD_TYPES_H_ #include "assets/assetFieldTypes.h" -#endif // Debug Profiling. #include "platform/profiler.h" diff --git a/Engine/source/collision/abstractPolyList.h b/Engine/source/collision/abstractPolyList.h index 9b3b00ef8..936f58419 100644 --- a/Engine/source/collision/abstractPolyList.h +++ b/Engine/source/collision/abstractPolyList.h @@ -19,19 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _ABSTRACTPOLYLIST_H_ -#define _ABSTRACTPOLYLIST_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _MPLANETRANSFORMER_H_ #include "math/mPlaneTransformer.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif class SceneObject; class BaseMatInstance; @@ -260,5 +252,3 @@ inline void AbstractPolyList::setObject(SceneObject* obj) mCurrObject = obj; } - -#endif // _ABSTRACTPOLYLIST_H_ diff --git a/Engine/source/collision/boxConvex.h b/Engine/source/collision/boxConvex.h index 80cc42854..95bc8a6f9 100644 --- a/Engine/source/collision/boxConvex.h +++ b/Engine/source/collision/boxConvex.h @@ -19,14 +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 _BOXCONVEX_H_ #define _BOXCONVEX_H_ - -#ifndef _CONVEX_H_ #include "collision/convex.h" -#endif - //---------------------------------------------------------------------------- diff --git a/Engine/source/collision/clippedPolyList.h b/Engine/source/collision/clippedPolyList.h index 45ff56b88..753b40694 100644 --- a/Engine/source/collision/clippedPolyList.h +++ b/Engine/source/collision/clippedPolyList.h @@ -19,20 +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 _CLIPPEDPOLYLIST_H_ #define _CLIPPEDPOLYLIST_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTORSPEC_H_ -#include "core/util/tVectorSpecializations.h" -#endif -#ifndef _ABSTRACTPOLYLIST_H_ -#include "collision/abstractPolyList.h" -#endif +#include "core/util/tVectorSpecializations.h" + +#include "collision/abstractPolyList.h" #define CLIPPEDPOLYLIST_FLAG_ALLOWCLIPPING 0x01 diff --git a/Engine/source/collision/collision.h b/Engine/source/collision/collision.h index be40199e6..6db39923a 100644 --- a/Engine/source/collision/collision.h +++ b/Engine/source/collision/collision.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 _COLLISION_H_ #define _COLLISION_H_ - -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif -#ifndef _MPLANE_H_ + #include "math/mPlane.h" -#endif -#ifndef _MPOINT2_H_ + #include "math/mPoint2.h" -#endif class SceneObject; class BaseMatInstance; diff --git a/Engine/source/collision/concretePolyList.h b/Engine/source/collision/concretePolyList.h index 131ddbd9b..63b7dd566 100644 --- a/Engine/source/collision/concretePolyList.h +++ b/Engine/source/collision/concretePolyList.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 _CONCRETEPOLYLIST_H_ #define _CONCRETEPOLYLIST_H_ - -#ifndef _ABSTRACTPOLYLIST_H_ #include "collision/abstractPolyList.h" -#endif /// A concrete, renderable PolyList /// diff --git a/Engine/source/collision/convex.h b/Engine/source/collision/convex.h index 9ae2e2a97..bdbc52a82 100644 --- a/Engine/source/collision/convex.h +++ b/Engine/source/collision/convex.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 _CONVEX_H_ #define _CONVEX_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif struct Collision; class CollisionList; diff --git a/Engine/source/collision/depthSortList.h b/Engine/source/collision/depthSortList.h index 3e46ef820..db3eda55c 100644 --- a/Engine/source/collision/depthSortList.h +++ b/Engine/source/collision/depthSortList.h @@ -19,14 +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 _DEPTHSORTLIST_H_ #define _DEPTHSORTLIST_H_ - -#ifndef _CLIPPEDPOLYLIST_H_ #include "collision/clippedPolyList.h" -#endif - //---------------------------------------------------------------------------- diff --git a/Engine/source/collision/earlyOutPolyList.h b/Engine/source/collision/earlyOutPolyList.h index b67cfc0ea..986f55143 100644 --- a/Engine/source/collision/earlyOutPolyList.h +++ b/Engine/source/collision/earlyOutPolyList.h @@ -19,14 +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 _EARLYOUTPOLYLIST_H_ #define _EARLYOUTPOLYLIST_H_ - -#ifndef _ABSTRACTPOLYLIST_H_ #include "collision/abstractPolyList.h" -#endif - /// Early out check PolyList /// diff --git a/Engine/source/collision/extrudedPolyList.h b/Engine/source/collision/extrudedPolyList.h index 2f3a58949..9ee42ce55 100644 --- a/Engine/source/collision/extrudedPolyList.h +++ b/Engine/source/collision/extrudedPolyList.h @@ -19,26 +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 _EXTRUDEDPOLYLIST_H_ #define _EXTRUDEDPOLYLIST_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _ABSTRACTPOLYLIST_H_ #include "collision/abstractPolyList.h" -#endif - class CollisionList; diff --git a/Engine/source/collision/gjk.h b/Engine/source/collision/gjk.h index 3980f95e5..491a702a2 100644 --- a/Engine/source/collision/gjk.h +++ b/Engine/source/collision/gjk.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 _GJK_H_ #define _GJK_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _CONVEX_H_ + #include "collision/convex.h" -#endif class Convex; struct CollisionStateList; diff --git a/Engine/source/collision/optimizedPolyList.h b/Engine/source/collision/optimizedPolyList.h index 772519c1f..cdd653e78 100644 --- a/Engine/source/collision/optimizedPolyList.h +++ b/Engine/source/collision/optimizedPolyList.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 _OPTIMIZEDPOLYLIST_H_ #define _OPTIMIZEDPOLYLIST_H_ - -#ifndef _ABSTRACTPOLYLIST_H_ #include "collision/abstractPolyList.h" -#endif -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif #define DEV 0.01 diff --git a/Engine/source/collision/planeExtractor.h b/Engine/source/collision/planeExtractor.h index 2fc65671d..23543e591 100644 --- a/Engine/source/collision/planeExtractor.h +++ b/Engine/source/collision/planeExtractor.h @@ -19,20 +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 _PLANEEXTRACTOR_H_ #define _PLANEEXTRACTOR_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ -#include "core/util/tVector.h" -#endif -#ifndef _ABSTRACTPOLYLIST_H_ -#include "collision/abstractPolyList.h" -#endif +#include "core/util/tVector.h" + +#include "collision/abstractPolyList.h" //---------------------------------------------------------------------------- diff --git a/Engine/source/collision/polytope.h b/Engine/source/collision/polytope.h index 34483c976..87b012adc 100644 --- a/Engine/source/collision/polytope.h +++ b/Engine/source/collision/polytope.h @@ -19,14 +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 _POLYTOPE_H_ #define _POLYTOPE_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - //---------------------------------------------------------------------------- diff --git a/Engine/source/collision/vertexPolyList.h b/Engine/source/collision/vertexPolyList.h index 241ee0c47..789863752 100644 --- a/Engine/source/collision/vertexPolyList.h +++ b/Engine/source/collision/vertexPolyList.h @@ -19,14 +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 _VERTEXPOLYLIST_H_ #define _VERTEXPOLYLIST_H_ - -#ifndef _ABSTRACTPOLYLIST_H_ #include "collision/abstractPolyList.h" -#endif - /// A simple polylist which only gathers the unique verticies passed to it. class VertexPolyList : public AbstractPolyList diff --git a/Engine/source/console/ICallMethod.h b/Engine/source/console/ICallMethod.h index 0c0d50299..713723959 100644 --- a/Engine/source/console/ICallMethod.h +++ b/Engine/source/console/ICallMethod.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 _ICALLMETHOD_H_ #define _ICALLMETHOD_H_ diff --git a/Engine/source/console/SimXMLDocument.h b/Engine/source/console/SimXMLDocument.h index c95ee9366..c56e226b5 100644 --- a/Engine/source/console/SimXMLDocument.h +++ b/Engine/source/console/SimXMLDocument.h @@ -23,13 +23,12 @@ //----------------------------------------------------------------------------- // Console implementation of STL map. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _XMLDOC_H_ #define _XMLDOC_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif #ifndef _TVECTOR_H_ #include "core/util/tVector.h" diff --git a/Engine/source/console/arrayObject.h b/Engine/source/console/arrayObject.h index cde4f92b6..1d806f42a 100644 --- a/Engine/source/console/arrayObject.h +++ b/Engine/source/console/arrayObject.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 _ARRAYOBJECT_H_ #define _ARRAYOBJECT_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif // This class is based on original code by community // member Daniel Neilsen: diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h index 8733df39f..0750aa508 100644 --- a/Engine/source/console/console.h +++ b/Engine/source/console/console.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 _CONSOLE_H_ #define _CONSOLE_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _BITSET_H_ + #include "core/bitSet.h" -#endif -#ifndef _REFBASE_H_ + #include "core/util/refBase.h" -#endif + #include #include "core/util/str.h" diff --git a/Engine/source/console/consoleFunctions.h b/Engine/source/console/consoleFunctions.h index 595aded87..72c8859ef 100644 --- a/Engine/source/console/consoleFunctions.h +++ b/Engine/source/console/consoleFunctions.h @@ -1,9 +1,8 @@ +#pragma once +#pragma once #ifndef _CONSOLFUNCTIONS_H_ #define _CONSOLFUNCTIONS_H_ - -#ifndef _STRINGFUNCTIONS_H_ #include "core/strings/stringFunctions.h" -#endif bool isInt(const char* str); diff --git a/Engine/source/console/consoleInternal.h b/Engine/source/console/consoleInternal.h index 735e9da58..1aecc64f0 100644 --- a/Engine/source/console/consoleInternal.h +++ b/Engine/source/console/consoleInternal.h @@ -19,25 +19,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _CONSOLEINTERNAL_H_ -#define _CONSOLEINTERNAL_H_ - -#ifndef _STRINGFUNCTIONS_H_ #include "core/strings/stringFunctions.h" -#endif -#ifndef _STRINGTABLE_H_ + #include "core/stringTable.h" -#endif -#ifndef _CONSOLETYPES_H #include "console/consoleTypes.h" -#endif -#ifndef _CONSOLEOBJECT_H_ + #include "console/simObject.h" -#endif -#ifndef _DATACHUNKER_H_ + #include "core/dataChunker.h" -#endif + #include "module.h" /// @ingroup console_system Console System @@ -529,5 +521,3 @@ namespace Con } /// @} - -#endif diff --git a/Engine/source/console/consoleLogger.h b/Engine/source/console/consoleLogger.h index 062da62cb..17e93ec4e 100644 --- a/Engine/source/console/consoleLogger.h +++ b/Engine/source/console/consoleLogger.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 _CONSOLE_LOGGER_H_ #define _CONSOLE_LOGGER_H_ diff --git a/Engine/source/console/consoleObject.cpp b/Engine/source/console/consoleObject.cpp index ad941d453..159da232e 100644 --- a/Engine/source/console/consoleObject.cpp +++ b/Engine/source/console/consoleObject.cpp @@ -95,6 +95,33 @@ void AbstractClassRep::init() } } +void AbstractClassRep::_buildPropertyTable(EnginePropertyTable& smPropTable, EnginePropertyTable& _smPropTable, const EngineTypeInfo* typeInfo) +{ + EnginePropertyTable::Property* props = new EnginePropertyTable::Property[sg_tempFieldList.size() + 1]; + + for (int i = 0; i < sg_tempFieldList.size(); ++i) + { + EnginePropertyTable::Property prop; + prop.mDocString = sg_tempFieldList[i].pFieldDocs; + prop.mName = sg_tempFieldList[i].pFieldname; + prop.mNumElements = sg_tempFieldList[i].elementCount; + prop.mFlags = 0; + if (sg_tempFieldList[i].type == StartGroupFieldType) + prop.mFlags |= EnginePropertyGroupBegin; + if (sg_tempFieldList[i].type == EndGroupFieldType) + prop.mFlags |= EnginePropertyGroupEnd; + prop.mType = sg_tempFieldList[i].type; + + props[i] = prop; + } + + _smPropTable = EnginePropertyTable(sg_tempFieldList.size(), props); + smPropTable = _smPropTable; + + // After we hand it off, immediately delete if safe: + delete[] props; +} + const AbstractClassRep::Field *AbstractClassRep::findField(StringTableEntry name) const { for(U32 i = 0; i < mFieldList.size(); i++) diff --git a/Engine/source/console/consoleObject.h b/Engine/source/console/consoleObject.h index bdfde53c3..37fe6b710 100644 --- a/Engine/source/console/consoleObject.h +++ b/Engine/source/console/consoleObject.h @@ -24,40 +24,20 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once #ifndef _CONSOLEOBJECT_H_ #define _CONSOLEOBJECT_H_ -#ifndef _TVECTOR_H_ - #include "core/util/tVector.h" -#endif -#ifndef _STRINGTABLE_H_ - #include "core/stringTable.h" -#endif -#ifndef _STRINGFUNCTIONS_H_ - #include "core/strings/stringFunctions.h" -#endif -#ifndef _BITSET_H_ - #include "core/bitSet.h" -#endif -#ifndef _DYNAMIC_CONSOLETYPES_H_ - #include "console/dynamicTypes.h" -#endif -#ifndef _ENGINEOBJECT_H_ - #include "console/engineObject.h" -#endif -#ifndef _ENGINEFUNCTIONS_H_ - #include "console/engineFunctions.h" -#endif -#ifndef _SIMOBJECTREF_H_ - #include "console/simObjectRef.h" -#endif -#ifndef TINYXML_INCLUDED - #include "tinyxml2.h" -#endif - -#ifndef _CONSOLFUNCTIONS_H_ +#include "core/util/tVector.h" +#include "core/stringTable.h" +#include "core/strings/stringFunctions.h" +#include "core/bitSet.h" +#include "console/dynamicTypes.h" +#include "console/engineObject.h" +#include "console/engineFunctions.h" +#include "console/simObjectRef.h" +#include "tinyxml2.h" #include "console/consoleFunctions.h" -#endif /// @file /// Legacy console object system. @@ -416,6 +396,9 @@ protected: AbstractClassRep * nextClass; AbstractClassRep * parentClass; Namespace * mNamespace; + void _buildPropertyTable(EnginePropertyTable& smPropTable, + EnginePropertyTable& _smPropTable, + const EngineTypeInfo* typeInfo); /// @} @@ -691,31 +674,9 @@ public: T::initPersistFields(); T::consoleInit(); - EnginePropertyTable::Property* props = new EnginePropertyTable::Property[sg_tempFieldList.size() + 1]; - - for (int i = 0; i < sg_tempFieldList.size(); ++i) - { - EnginePropertyTable::Property prop; - prop.mDocString = sg_tempFieldList[i].pFieldDocs; - prop.mName = sg_tempFieldList[i].pFieldname; - prop.mNumElements = sg_tempFieldList[i].elementCount; - prop.mFlags = 0; - if (sg_tempFieldList[i].type == StartGroupFieldType) - prop.mFlags |= EnginePropertyGroupBegin; - if (sg_tempFieldList[i].type == EndGroupFieldType) - prop.mFlags |= EnginePropertyGroupEnd; - prop.mType = sg_tempFieldList[i].type; - - props[i] = prop; - } - - _smPropertyTable = EnginePropertyTable(sg_tempFieldList.size(), props); - smPropertyTable = _smPropertyTable; + _buildPropertyTable(smPropertyTable, _smPropertyTable, mTypeInfo); const_cast(mTypeInfo)->mPropertyTable = &_smPropertyTable; - - // After we hand it off, immediately delete if safe: - delete[] props; // Let the base finish up. AbstractClassRep::init(); } diff --git a/Engine/source/console/consoleParser.h b/Engine/source/console/consoleParser.h index cc18fcf9d..501f305d5 100644 --- a/Engine/source/console/consoleParser.h +++ b/Engine/source/console/consoleParser.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 _CONSOLE_PARSER_H_ #define _CONSOLE_PARSER_H_ diff --git a/Engine/source/console/consoleTypes.h b/Engine/source/console/consoleTypes.h index 6ebc35839..83e49438b 100644 --- a/Engine/source/console/consoleTypes.h +++ b/Engine/source/console/consoleTypes.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 _CONSOLETYPES_H_ #define _CONSOLETYPES_H_ - -#ifndef _DYNAMIC_CONSOLETYPES_H_ #include "console/dynamicTypes.h" -#endif -#ifndef _MATHTYPES_H_ #include "math/mathTypes.h" -#endif -#ifndef _ENGINEPRIMITIVES_H_ #include "console/enginePrimitives.h" -#endif -#ifndef _ENGINESTRUCTS_H_ #include "console/engineStructs.h" -#endif template inline const T nullAsType(){ return NULL; } diff --git a/Engine/source/console/consoleValueStack.h b/Engine/source/console/consoleValueStack.h index 529f5f1a9..efee16cf1 100644 --- a/Engine/source/console/consoleValueStack.h +++ b/Engine/source/console/consoleValueStack.h @@ -20,6 +20,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _CONSOLE_CONSOLE_VALUE_STACK_H_ #define _CONSOLE_CONSOLE_VALUE_STACK_H_ diff --git a/Engine/source/console/consoleXMLExport.h b/Engine/source/console/consoleXMLExport.h index c3b2084f0..80a53dcb8 100644 --- a/Engine/source/console/consoleXMLExport.h +++ b/Engine/source/console/consoleXMLExport.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 _CONSOLEXMLEXPORT_H_ #define _CONSOLEXMLEXPORT_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif class SimXMLDocument; diff --git a/Engine/source/console/debugOutputConsumer.h b/Engine/source/console/debugOutputConsumer.h index 2bfd81cd2..42bb55502 100644 --- a/Engine/source/console/debugOutputConsumer.h +++ b/Engine/source/console/debugOutputConsumer.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 _DEBUGOUTPUTCONSUMER_H_ #define _DEBUGOUTPUTCONSUMER_H_ diff --git a/Engine/source/console/dynamicTypes.h b/Engine/source/console/dynamicTypes.h index 65476f00f..e82004122 100644 --- a/Engine/source/console/dynamicTypes.h +++ b/Engine/source/console/dynamicTypes.h @@ -19,25 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _DYNAMIC_CONSOLETYPES_H_ -#define _DYNAMIC_CONSOLETYPES_H_ - -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif -#ifndef _STRINGFUNCTIONS_H_ #include "core/strings/stringFunctions.h" -#endif -#ifndef _ENGINETYPEINFO_H_ #include "console/engineTypeInfo.h" -#endif -#ifndef _STRINGTABLE_H_ #include "core/stringTable.h" -#endif /// @file /// Support for legacy TorqueScript console types. @@ -454,5 +444,3 @@ const EngineTypeInfo* _MAPTYPE() { return TYPE< T >(); } END_IMPLEMENT_BITFIELD /// @} - -#endif diff --git a/Engine/source/console/engineAPI.h b/Engine/source/console/engineAPI.h index ada1c305c..5e858758b 100644 --- a/Engine/source/console/engineAPI.h +++ b/Engine/source/console/engineAPI.h @@ -19,36 +19,25 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _ENGINEAPI_H_ #define _ENGINEAPI_H_ #include #include - -#ifndef _FIXEDTUPLE_H_ #include "fixedTuple.h" -#endif -#ifndef _CONSOLETYPES_H_ #include "console/consoleTypes.h" -#endif -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif -#ifndef _STRINGFUNCTIONS_H_ #include "core/strings/stringFunctions.h" -#endif -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _ENGINEFUNCTIONS_H_ #include "console/engineFunctions.h" -#endif // Whatever types are used in API definitions, their DECLAREs must be visible to the // macros. We include the basic primitive and struct types here. @@ -61,10 +50,7 @@ #endif // Needed for the executef macros. Blame GCC. -#ifndef _SIMEVENTS_H_ #include "console/simEvents.h" -#endif - /// @file /// Definitions for exposing engine functionality to the control layer. diff --git a/Engine/source/console/engineExports.h b/Engine/source/console/engineExports.h index 8f01a5f93..2babfb73f 100644 --- a/Engine/source/console/engineExports.h +++ b/Engine/source/console/engineExports.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 _ENGINEEXPORTS_H_ #define _ENGINEEXPORTS_H_ diff --git a/Engine/source/console/engineFunctions.h b/Engine/source/console/engineFunctions.h index 63c6cbb49..f902234b9 100644 --- a/Engine/source/console/engineFunctions.h +++ b/Engine/source/console/engineFunctions.h @@ -19,15 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _ENGINEFUNCTIONS_H_ #define _ENGINEFUNCTIONS_H_ #include - -#ifndef _FIXEDTUPLE_H_ #include "fixedTuple.h" -#endif #ifndef _ENGINEEXPORTS_H_ #include "console/engineExports.h" diff --git a/Engine/source/console/engineObject.h b/Engine/source/console/engineObject.h index 64cd9c1bc..220ccaa9b 100644 --- a/Engine/source/console/engineObject.h +++ b/Engine/source/console/engineObject.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 _ENGINEOBJECT_H_ #define _ENGINEOBJECT_H_ diff --git a/Engine/source/console/enginePrimitives.h b/Engine/source/console/enginePrimitives.h index d1f373e00..556871479 100644 --- a/Engine/source/console/enginePrimitives.h +++ b/Engine/source/console/enginePrimitives.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 _ENGINEPRIMITIVES_H_ #define _ENGINEPRIMITIVES_H_ diff --git a/Engine/source/console/engineStructs.h b/Engine/source/console/engineStructs.h index 57b9a4050..5302c0d86 100644 --- a/Engine/source/console/engineStructs.h +++ b/Engine/source/console/engineStructs.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 _ENGINESTRUCTS_H_ #define _ENGINESTRUCTS_H_ diff --git a/Engine/source/console/engineTypeInfo.h b/Engine/source/console/engineTypeInfo.h index 83a3c0c58..7af3ae000 100644 --- a/Engine/source/console/engineTypeInfo.h +++ b/Engine/source/console/engineTypeInfo.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 _ENGINETYPEINFO_H_ #define _ENGINETYPEINFO_H_ diff --git a/Engine/source/console/engineTypes.h b/Engine/source/console/engineTypes.h index e6bb3a6ea..2be4593a9 100644 --- a/Engine/source/console/engineTypes.h +++ b/Engine/source/console/engineTypes.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 _ENGINETYPES_H_ #define _ENGINETYPES_H_ diff --git a/Engine/source/console/fieldBrushObject.h b/Engine/source/console/fieldBrushObject.h index 96b213f44..a8f8914ae 100644 --- a/Engine/source/console/fieldBrushObject.h +++ b/Engine/source/console/fieldBrushObject.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 _FIELDBRUSHOBJECT_H_ #define _FIELDBRUSHOBJECT_H_ diff --git a/Engine/source/console/fixedTuple.h b/Engine/source/console/fixedTuple.h index 60b43be1f..054d36886 100644 --- a/Engine/source/console/fixedTuple.h +++ b/Engine/source/console/fixedTuple.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 _FIXEDTUPLE_H_ #define _FIXEDTUPLE_H_ diff --git a/Engine/source/console/module.h b/Engine/source/console/module.h index 271424dc4..96e8336bc 100644 --- a/Engine/source/console/module.h +++ b/Engine/source/console/module.h @@ -1,3 +1,4 @@ +#pragma once #ifndef _SCRIPT_MODULE_H_ #define _SCRIPT_MODULE_H_ #include "runtime.h" diff --git a/Engine/source/console/persistenceManager.h b/Engine/source/console/persistenceManager.h index 0ee2368de..131c39049 100644 --- a/Engine/source/console/persistenceManager.h +++ b/Engine/source/console/persistenceManager.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 _PERSISTENCEMANAGER_H_ #define _PERSISTENCEMANAGER_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _SIMOBJECTLIST_H_ #include "console/simObjectList.h" -#endif -#ifndef _TOKENIZER_H_ #include "core/tokenizer.h" -#endif class PersistenceManager : public SimObject { diff --git a/Engine/source/console/propertyParsing.h b/Engine/source/console/propertyParsing.h index 69bdc09f6..75de547d2 100644 --- a/Engine/source/console/propertyParsing.h +++ b/Engine/source/console/propertyParsing.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 _PROPERTYPARSING_H_ #define _PROPERTYPARSING_H_ diff --git a/Engine/source/console/returnBuffer.h b/Engine/source/console/returnBuffer.h index 9fa374cb5..5eb2cc01e 100644 --- a/Engine/source/console/returnBuffer.h +++ b/Engine/source/console/returnBuffer.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 _RETURNBUFFER_H_ #define _RETURNBUFFER_H_ diff --git a/Engine/source/console/runtime.h b/Engine/source/console/runtime.h index 25ac604e4..e4730b761 100644 --- a/Engine/source/console/runtime.h +++ b/Engine/source/console/runtime.h @@ -1,3 +1,5 @@ +#pragma once +#pragma once #ifndef _RUNTIME_H_ #define _RUNTIME_H_ diff --git a/Engine/source/console/runtimeClassRep.h b/Engine/source/console/runtimeClassRep.h index 4cab0dbd9..277ccc60f 100644 --- a/Engine/source/console/runtimeClassRep.h +++ b/Engine/source/console/runtimeClassRep.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 _RUNTIME_CLASSREP_H_ #define _RUNTIME_CLASSREP_H_ diff --git a/Engine/source/console/script.h b/Engine/source/console/script.h index d6dca7c24..e085e1c9e 100644 --- a/Engine/source/console/script.h +++ b/Engine/source/console/script.h @@ -1,3 +1,5 @@ +#pragma once +#pragma once #ifndef _SCRIPT_H_ #define _SCRIPT_H_ diff --git a/Engine/source/console/scriptFilename.h b/Engine/source/console/scriptFilename.h index 2dbc33fe1..4c1b2eb27 100644 --- a/Engine/source/console/scriptFilename.h +++ b/Engine/source/console/scriptFilename.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 _SCRIPTFILENAME_H_ #define _SCRIPTFILENAME_H_ diff --git a/Engine/source/console/scriptObjects.h b/Engine/source/console/scriptObjects.h index 45de8aa17..61bd94dae 100644 --- a/Engine/source/console/scriptObjects.h +++ b/Engine/source/console/scriptObjects.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 _SCRIPTOBJECTS_H_ #define _SCRIPTOBJECTS_H_ - -#ifndef _CONSOLEINTERNAL_H_ #include "console/consoleInternal.h" -#endif -#ifndef _ITICKABLE_H_ #include "core/iTickable.h" -#endif //----------------------------------------------------------------------------- // ScriptObject diff --git a/Engine/source/console/sim.h b/Engine/source/console/sim.h index 8b8f41b4e..8578b53c2 100644 --- a/Engine/source/console/sim.h +++ b/Engine/source/console/sim.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 _SIM_H_ #define _SIM_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif -#ifndef _TORQUE_STRING_H_ + #include "core/util/str.h" -#endif -#ifndef _MODULE_H_ + #include "core/module.h" -#endif -#ifndef _CONSOLE_H_ + #include "console/console.h" -#endif // Forward Refs class SimSet; diff --git a/Engine/source/console/simBase.h b/Engine/source/console/simBase.h index e7182c347..b23deaae9 100644 --- a/Engine/source/console/simBase.h +++ b/Engine/source/console/simBase.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 _SIMBASE_H_ #define _SIMBASE_H_ diff --git a/Engine/source/console/simDatablock.h b/Engine/source/console/simDatablock.h index 2f5c8efcc..0254b9af3 100644 --- a/Engine/source/console/simDatablock.h +++ b/Engine/source/console/simDatablock.h @@ -24,12 +24,11 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _SIMDATABLOCK_H_ #define _SIMDATABLOCK_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif // Forward Refs class BitStream; diff --git a/Engine/source/console/simDictionary.h b/Engine/source/console/simDictionary.h index 1247d504e..637cd5f51 100644 --- a/Engine/source/console/simDictionary.h +++ b/Engine/source/console/simDictionary.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 _SIMDICTIONARY_H_ #define _SIMDICTIONARY_H_ -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _STRINGTABLE_H_ -#include "core/stringTable.h" -#endif -#ifndef _PLATFORMMUTEX_H_ +#include "core/stringTable.h" + #include "platform/threads/mutex.h" -#endif #include "torqueConfig.h" @@ -40,10 +37,7 @@ class SimObject; #ifdef USE_NEW_SIMDICTIONARY #include #include - -#ifndef _SIM_H_ #include "console/sim.h" -#endif struct StringTableEntryHash { diff --git a/Engine/source/console/simEvents.h b/Engine/source/console/simEvents.h index 9f6893ff2..612d28104 100644 --- a/Engine/source/console/simEvents.h +++ b/Engine/source/console/simEvents.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SIMEVENTS_H_ #define _SIMEVENTS_H_ - -#ifndef _SIM_H_ #include "console/sim.h" -#endif - -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif // Forward Refs class SimObject; diff --git a/Engine/source/console/simFieldDictionary.h b/Engine/source/console/simFieldDictionary.h index 9701f2e1d..bfb03c074 100644 --- a/Engine/source/console/simFieldDictionary.h +++ b/Engine/source/console/simFieldDictionary.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 _SIMFIELDDICTIONARY_H_ #define _SIMFIELDDICTIONARY_H_ @@ -34,10 +36,7 @@ class SimObject; #include "core/stringTable.h" #include "core/stream/stream.h" - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif /// Dictionary to keep track of dynamic fields on SimObject. class SimFieldDictionary diff --git a/Engine/source/console/simObject.h b/Engine/source/console/simObject.h index 1ea3a2b5d..3e2ecba17 100644 --- a/Engine/source/console/simObject.h +++ b/Engine/source/console/simObject.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 _SIMOBJECT_H_ #define _SIMOBJECT_H_ @@ -36,14 +38,9 @@ #ifndef _BITSET_H_ #include "core/bitSet.h" #endif - -#ifndef _TAML_CALLBACKS_H_ #include "persistence/taml/tamlCallbacks.h" -#endif -#ifndef _OBJECTTYPES_H_ #include "T3D/objectTypes.h" -#endif class Stream; class LightManager; diff --git a/Engine/source/console/simObjectList.h b/Engine/source/console/simObjectList.h index 88c72a396..8a06f1def 100644 --- a/Engine/source/console/simObjectList.h +++ b/Engine/source/console/simObjectList.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 +#pragma once #ifndef _SIMOBJECTLIST_H_ #define _SIMOBJECTLIST_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _TALGORITHM_H_ + #include "core/tAlgorithm.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif // Forward Refs class SimObject; diff --git a/Engine/source/console/simObjectMemento.h b/Engine/source/console/simObjectMemento.h index 45b8a9e4d..824e01a5d 100644 --- a/Engine/source/console/simObjectMemento.h +++ b/Engine/source/console/simObjectMemento.h @@ -19,14 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _CONSOLE_SIMOBJECTMEMENTO_H_ #define _CONSOLE_SIMOBJECTMEMENTO_H_ - -#ifndef _SIM_H_ #include "console/sim.h" -#endif - /// This simple class is used to store an SimObject and /// its state so it can be recreated at a later time. diff --git a/Engine/source/console/simObjectRef.h b/Engine/source/console/simObjectRef.h index 8e7201966..c5c8d3294 100644 --- a/Engine/source/console/simObjectRef.h +++ b/Engine/source/console/simObjectRef.h @@ -19,20 +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 _SIMOBJECTREF_H_ #define _SIMOBJECTREF_H_ - - -#ifndef _DYNAMIC_CONSOLETYPES_H_ #include "console/dynamicTypes.h" -#endif -#ifndef _SIM_H_ #include "console/sim.h" -#endif - - // SimObjectRef diff --git a/Engine/source/console/simPersistID.h b/Engine/source/console/simPersistID.h index 1035f0768..ca7cf4de8 100644 --- a/Engine/source/console/simPersistID.h +++ b/Engine/source/console/simPersistID.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 _SIMPERSISTID_H_ #define _SIMPERSISTID_H_ diff --git a/Engine/source/console/simPersistSet.h b/Engine/source/console/simPersistSet.h index ea1cc72b8..1d619bf41 100644 --- a/Engine/source/console/simPersistSet.h +++ b/Engine/source/console/simPersistSet.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 _SIMPERSISTSET_H_ #define _SIMPERSISTSET_H_ diff --git a/Engine/source/console/simSet.h b/Engine/source/console/simSet.h index 09e94fd1e..b75305401 100644 --- a/Engine/source/console/simSet.h +++ b/Engine/source/console/simSet.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 _SIMSET_H_ #define _SIMSET_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _SIMOBJECTLIST_H_ #include "console/simObjectList.h" -#endif -#ifndef _SIMDICTIONARY_H_ #include "console/simDictionary.h" -#endif -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif #include "persistence/taml/tamlChildren.h" diff --git a/Engine/source/console/stringStack.h b/Engine/source/console/stringStack.h index 1ebac1fc7..a82ab0c22 100644 --- a/Engine/source/console/stringStack.h +++ b/Engine/source/console/stringStack.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 _STRINGSTACK_H_ #define _STRINGSTACK_H_ - -#ifndef _STRINGFUNCTIONS_H_ #include "core/strings/stringFunctions.h" -#endif -#ifndef _STRINGTABLE_H_ #include "core/stringTable.h" -#endif -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif typedef U32 StringStackPtr; struct StringStack; diff --git a/Engine/source/console/telnetConsole.h b/Engine/source/console/telnetConsole.h index 4d848a0b5..ae377d9e2 100644 --- a/Engine/source/console/telnetConsole.h +++ b/Engine/source/console/telnetConsole.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _TELNETCONSOLE_H_ #define _TELNETCONSOLE_H_ - -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif + #include "platform/platformNet.h" /// Telnet admin console. diff --git a/Engine/source/console/telnetDebugger.h b/Engine/source/console/telnetDebugger.h index 627ce5dc1..5cfa1941c 100644 --- a/Engine/source/console/telnetDebugger.h +++ b/Engine/source/console/telnetDebugger.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _TELNETDEBUGGER_H_ #define _TELNETDEBUGGER_H_ - -#ifndef _PLATFORM_PLATFORMNET_H_ #include "platform/platformNet.h" -#endif + #include "module.h" /// Telnet debug service implementation. diff --git a/Engine/source/console/torquescript/ast.h b/Engine/source/console/torquescript/ast.h index 69b30da01..6def5b473 100644 --- a/Engine/source/console/torquescript/ast.h +++ b/Engine/source/console/torquescript/ast.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 _AST_H_ #define _AST_H_ diff --git a/Engine/source/console/torquescript/codeBlock.h b/Engine/source/console/torquescript/codeBlock.h index 33404d9a6..02a59188b 100644 --- a/Engine/source/console/torquescript/codeBlock.h +++ b/Engine/source/console/torquescript/codeBlock.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 _CODEBLOCK_H_ #define _CODEBLOCK_H_ diff --git a/Engine/source/console/torquescript/compiler.h b/Engine/source/console/torquescript/compiler.h index 4b997b5d4..a7d29d442 100644 --- a/Engine/source/console/torquescript/compiler.h +++ b/Engine/source/console/torquescript/compiler.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 _COMPILER_H_ @@ -41,10 +43,7 @@ class DataChunker; #include "platform/platform.h" #include "ast.h" #include "codeBlock.h" - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif //------------------------------------------------------------ diff --git a/Engine/source/console/torquescript/parser.h b/Engine/source/console/torquescript/parser.h index cda386aca..5c83e7883 100644 --- a/Engine/source/console/torquescript/parser.h +++ b/Engine/source/console/torquescript/parser.h @@ -1,4 +1,5 @@ -#ifndef _TORQUESCRIPT_PARSER_H_ +#pragma once +#ifndef _TORQUESCRIPT_PARSER_H_ #define _TORQUESCRIPT_PARSER_H_ #include diff --git a/Engine/source/console/torquescript/runtime.h b/Engine/source/console/torquescript/runtime.h index 42bde09f7..b885338a9 100644 --- a/Engine/source/console/torquescript/runtime.h +++ b/Engine/source/console/torquescript/runtime.h @@ -1,4 +1,5 @@ -#ifndef _TORQUESCRIPT_RUNTIME_H_ +#pragma once +#ifndef _TORQUESCRIPT_RUNTIME_H_ #define _TORQUESCRIPT_RUNTIME_H_ #include "ast.h" #include "console/runtime.h" diff --git a/Engine/source/console/typeValidators.h b/Engine/source/console/typeValidators.h index 78c9e4bdb..8e09d0630 100644 --- a/Engine/source/console/typeValidators.h +++ b/Engine/source/console/typeValidators.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 _TYPEVALIDATORS_H_ #define _TYPEVALIDATORS_H_ - -#ifndef _MMATHFN_H_ #include "math/mMathFn.h" -#endif class TypeValidator { diff --git a/Engine/source/core/bitMatrix.h b/Engine/source/core/bitMatrix.h index 0c7582a9b..40921cfa3 100644 --- a/Engine/source/core/bitMatrix.h +++ b/Engine/source/core/bitMatrix.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 _BITMATRIX_H_ #define _BITMATRIX_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _BITVECTOR_H_ + #include "core/bitVector.h" -#endif /// A matrix of bits. /// diff --git a/Engine/source/core/bitRender.h b/Engine/source/core/bitRender.h index c832b7c48..532be2090 100644 --- a/Engine/source/core/bitRender.h +++ b/Engine/source/core/bitRender.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 _BITRENDER_H_ #define _BITRENDER_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif /// Functions for rendering to 1bpp bitmaps. /// diff --git a/Engine/source/core/bitSet.h b/Engine/source/core/bitSet.h index d5d42363b..c6aea86b0 100644 --- a/Engine/source/core/bitSet.h +++ b/Engine/source/core/bitSet.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 _BITSET_H_ #define _BITSET_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif /// A convenience class to manipulate a set of bits. /// diff --git a/Engine/source/core/bitVector.h b/Engine/source/core/bitVector.h index 99e02222e..5c5f56546 100644 --- a/Engine/source/core/bitVector.h +++ b/Engine/source/core/bitVector.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 _BITVECTOR_H_ #define _BITVECTOR_H_ diff --git a/Engine/source/core/bitVectorW.h b/Engine/source/core/bitVectorW.h index 6a023611a..bcd59275d 100644 --- a/Engine/source/core/bitVectorW.h +++ b/Engine/source/core/bitVectorW.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 _BITVECTORW_H_ #define _BITVECTORW_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif /// @see BitVector class BitVectorW diff --git a/Engine/source/core/color.h b/Engine/source/core/color.h index c3592dec3..0e05677ef 100644 --- a/Engine/source/core/color.h +++ b/Engine/source/core/color.h @@ -19,20 +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 _COLOR_H_ #define _COLOR_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _MPOINT4_H_ -#include "math/mPoint4.h" -#endif -#ifndef _ENGINEAPI_H_ +#include "math/mPoint4.h" + #include "console/engineAPI.h" -#endif #ifdef TORQUE_USE_LEGACY_GAMMA const F32 gGamma = 2.2f; diff --git a/Engine/source/core/crc.h b/Engine/source/core/crc.h index 97280ae19..7f898d211 100644 --- a/Engine/source/core/crc.h +++ b/Engine/source/core/crc.h @@ -19,14 +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 _CRC_H_ #define _CRC_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif - class Stream; diff --git a/Engine/source/core/dataChunker.h b/Engine/source/core/dataChunker.h index 226878711..b52283bba 100644 --- a/Engine/source/core/dataChunker.h +++ b/Engine/source/core/dataChunker.h @@ -4,6 +4,8 @@ // // SPDX-License-Identifier: MIT //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _DATACHUNKER_H_ #define _DATACHUNKER_H_ @@ -14,9 +16,7 @@ #ifndef _PLATFORMASSERT_H_ # include "platform/platformAssert.h" #endif -#ifndef _FRAMEALLOCATOR_H_ #include "core/frameAllocator.h" -#endif #include #include diff --git a/Engine/source/core/dnet.h b/Engine/source/core/dnet.h index 56ba7acf6..64849e8e4 100644 --- a/Engine/source/core/dnet.h +++ b/Engine/source/core/dnet.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 _DNET_H_ #define _DNET_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif #include "platform/platformNet.h" diff --git a/Engine/source/core/factoryCache.h b/Engine/source/core/factoryCache.h index dbecc152a..3657a0f7a 100644 --- a/Engine/source/core/factoryCache.h +++ b/Engine/source/core/factoryCache.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 _FACTORY_CACHE_H_ #define _FACTORY_CACHE_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/core/fileObject.h b/Engine/source/core/fileObject.h index ae2f20bd2..74e3631ad 100644 --- a/Engine/source/core/fileObject.h +++ b/Engine/source/core/fileObject.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 _FILEOBJECT_H_ #define _FILEOBJECT_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _FILESTREAM_H_ + #include "core/stream/fileStream.h" -#endif class FileObject : public SimObject { diff --git a/Engine/source/core/fileio.h b/Engine/source/core/fileio.h index a7deb1078..0911b0c0c 100644 --- a/Engine/source/core/fileio.h +++ b/Engine/source/core/fileio.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 _FILEIO_H_ #define _FILEIO_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif class File { diff --git a/Engine/source/core/filterStream.h b/Engine/source/core/filterStream.h index 27a1834be..eddc99052 100644 --- a/Engine/source/core/filterStream.h +++ b/Engine/source/core/filterStream.h @@ -19,17 +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 _FILTERSTREAM_H_ #define _FILTERSTREAM_H_ //Includes -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _STREAM_H_ + #include "core/stream/stream.h" -#endif class FilterStream : public Stream { diff --git a/Engine/source/core/frameAllocator.h b/Engine/source/core/frameAllocator.h index 7d09f2b86..b905ed349 100644 --- a/Engine/source/core/frameAllocator.h +++ b/Engine/source/core/frameAllocator.h @@ -4,13 +4,12 @@ // // SPDX-License-Identifier: MIT //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _FRAMEALLOCATOR_H_ #define _FRAMEALLOCATOR_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif /// Implements an buffer which allocates data based on the alignment of type T. /// diff --git a/Engine/source/core/iTickable.h b/Engine/source/core/iTickable.h index 1f5123835..bfdf1ac6f 100644 --- a/Engine/source/core/iTickable.h +++ b/Engine/source/core/iTickable.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 _ITICKABLE_H_ #define _ITICKABLE_H_ diff --git a/Engine/source/core/idGenerator.h b/Engine/source/core/idGenerator.h index 8c3467673..7536b06fb 100644 --- a/Engine/source/core/idGenerator.h +++ b/Engine/source/core/idGenerator.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 _IDGENERATOR_H_ #define _IDGENERATOR_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif class IdGenerator { diff --git a/Engine/source/core/memVolume.h b/Engine/source/core/memVolume.h index f3dbe95a7..bc01f05c4 100644 --- a/Engine/source/core/memVolume.h +++ b/Engine/source/core/memVolume.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 +#pragma once #ifndef _MEMVOLUME_H_ #define _MEMVOLUME_H_ - -#ifndef _VOLUME_H_ #include "core/volume.h" -#endif -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif namespace Torque { diff --git a/Engine/source/core/module.h b/Engine/source/core/module.h index 49be0665e..4cda94d87 100644 --- a/Engine/source/core/module.h +++ b/Engine/source/core/module.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 _MODULE_H_ #define _MODULE_H_ diff --git a/Engine/source/core/ogg/oggInputStream.h b/Engine/source/core/ogg/oggInputStream.h index 5c975f9cd..b11cd9c13 100644 --- a/Engine/source/core/ogg/oggInputStream.h +++ b/Engine/source/core/ogg/oggInputStream.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 _OGGINPUTSTREAM_H_ #define _OGGINPUTSTREAM_H_ diff --git a/Engine/source/core/ogg/oggTheoraDecoder.h b/Engine/source/core/ogg/oggTheoraDecoder.h index dc5a6245c..34f9e584b 100644 --- a/Engine/source/core/ogg/oggTheoraDecoder.h +++ b/Engine/source/core/ogg/oggTheoraDecoder.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 _OGGTHEORADECODER_H_ #define _OGGTHEORADECODER_H_ diff --git a/Engine/source/core/ogg/oggVorbisDecoder.h b/Engine/source/core/ogg/oggVorbisDecoder.h index 3319cd3be..d013f84f0 100644 --- a/Engine/source/core/ogg/oggVorbisDecoder.h +++ b/Engine/source/core/ogg/oggVorbisDecoder.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 _OGGVORBISDECODER_H_ #define _OGGVORBISDECODER_H_ diff --git a/Engine/source/core/resizeStream.h b/Engine/source/core/resizeStream.h index c925921c5..f34af0787 100644 --- a/Engine/source/core/resizeStream.h +++ b/Engine/source/core/resizeStream.h @@ -19,17 +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 _RESIZESTREAM_H_ #define _RESIZESTREAM_H_ //Includes -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _FILTERSTREAM_H_ + #include "core/filterStream.h" -#endif class ResizeFilterStream : public FilterStream, public IStreamByteCount { diff --git a/Engine/source/core/resource.h b/Engine/source/core/resource.h index 04334e981..b83ac76e2 100644 --- a/Engine/source/core/resource.h +++ b/Engine/source/core/resource.h @@ -22,30 +22,17 @@ #ifndef __RESOURCE_H__ #define __RESOURCE_H__ - -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif -#ifndef _PATH_H_ #include "core/util/path.h" -#endif -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _TIMECLASS_H_ #include "core/util/timeClass.h" -#endif -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _PLATFORMASSERT_H_ #include "platform/platformAssert.h" -#endif #include diff --git a/Engine/source/core/resourceManager.h b/Engine/source/core/resourceManager.h index 0d6a4686b..d9efff267 100644 --- a/Engine/source/core/resourceManager.h +++ b/Engine/source/core/resourceManager.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 _RESOURCEMANAGER_H_ #define _RESOURCEMANAGER_H_ @@ -26,10 +28,7 @@ #ifndef __RESOURCE_H__ #include "core/resource.h" #endif - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif class ResourceManager { diff --git a/Engine/source/core/stream/bitStream.h b/Engine/source/core/stream/bitStream.h index 0fe5895d6..438039718 100644 --- a/Engine/source/core/stream/bitStream.h +++ b/Engine/source/core/stream/bitStream.h @@ -24,19 +24,16 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _BITSTREAM_H_ #define _BITSTREAM_H_ - -#ifndef _STREAM_H_ #include "core/stream/stream.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _CRC_H_ + #include "core/crc.h" -#endif //-------------------------------------- Some caveats when using this class: // - Get/setPosition semantics are changed diff --git a/Engine/source/core/stream/fileStream.h b/Engine/source/core/stream/fileStream.h index 9ae20798a..bbf612648 100644 --- a/Engine/source/core/stream/fileStream.h +++ b/Engine/source/core/stream/fileStream.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 _FILESTREAM_H_ #define _FILESTREAM_H_ - -#ifndef _VOLUME_H_ #include "core/volume.h" -#endif -#ifndef _STREAM_H_ + #include "core/stream/stream.h" -#endif class FileStream : public Stream { diff --git a/Engine/source/core/stream/fileStreamObject.h b/Engine/source/core/stream/fileStreamObject.h index 2db6c9348..bd105d913 100644 --- a/Engine/source/core/stream/fileStreamObject.h +++ b/Engine/source/core/stream/fileStreamObject.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 _FILESTREAMOBJECT_H_ #define _FILESTREAMOBJECT_H_ - -#ifndef _STREAMOBJECT_H_ #include "core/stream/streamObject.h" -#endif -#ifndef _FILESTREAM_H_ #include "core/stream/fileStream.h" -#endif - class FileStreamObject : public StreamObject { diff --git a/Engine/source/core/stream/ioHelper.h b/Engine/source/core/stream/ioHelper.h index ed006aff6..43d9f807f 100644 --- a/Engine/source/core/stream/ioHelper.h +++ b/Engine/source/core/stream/ioHelper.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 _UTIL_IOHELPER_H_ #define _UTIL_IOHELPER_H_ - -#ifndef _CORE_STREAM_H_ #include "core/stream/stream.h" -#endif /// Helper templates to aggregate IO operations - generally used in /// template expansion. diff --git a/Engine/source/core/stream/memStream.h b/Engine/source/core/stream/memStream.h index 9cb99a5a5..fcd147424 100644 --- a/Engine/source/core/stream/memStream.h +++ b/Engine/source/core/stream/memStream.h @@ -19,14 +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 _MEMSTREAM_H_ #define _MEMSTREAM_H_ - -#ifndef _STREAM_H_ #include "core/stream/stream.h" -#endif - /// The MemStream class is used to read and write to a memory buffer. class MemStream : public Stream diff --git a/Engine/source/core/stream/stream.h b/Engine/source/core/stream/stream.h index 2db20dde3..549aa5c30 100644 --- a/Engine/source/core/stream/stream.h +++ b/Engine/source/core/stream/stream.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 _STREAM_H_ #define _STREAM_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif -#ifndef _ENDIAN_H_ + #include "core/util/endian.h" -#endif -#ifndef _STRINGFUNCTIONS_H_ + #include "core/strings/stringFunctions.h" -#endif /// @defgroup stream_overload Primitive Type Stream Operation Overloads /// These macros declare the read and write functions for all primitive types. diff --git a/Engine/source/core/stream/streamObject.h b/Engine/source/core/stream/streamObject.h index be5c1d69a..e18a7a24b 100644 --- a/Engine/source/core/stream/streamObject.h +++ b/Engine/source/core/stream/streamObject.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 _STREAMOBJECT_H_ #define _STREAMOBJECT_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif /// @addtogroup zip_group // @{ diff --git a/Engine/source/core/stream/tStream.h b/Engine/source/core/stream/tStream.h index 5286116ac..585d90a0d 100644 --- a/Engine/source/core/stream/tStream.h +++ b/Engine/source/core/stream/tStream.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 _TSTREAM_H_ #define _TSTREAM_H_ diff --git a/Engine/source/core/stringBuffer.h b/Engine/source/core/stringBuffer.h index 003d4a491..97ff65ca3 100644 --- a/Engine/source/core/stringBuffer.h +++ b/Engine/source/core/stringBuffer.h @@ -19,18 +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 _STRINGBUFFER_H_ #define _STRINGBUFFER_H_ //Includes -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif #include "console/console.h" diff --git a/Engine/source/core/stringTable.cpp b/Engine/source/core/stringTable.cpp index 11ecdb82c..8058a3819 100644 --- a/Engine/source/core/stringTable.cpp +++ b/Engine/source/core/stringTable.cpp @@ -24,6 +24,8 @@ #include "core/stringTable.h" #include "platform/profiler.h" +template class Vector; + _StringTable *_gStringTable = NULL; const U32 _StringTable::csm_stInitSize = 29; diff --git a/Engine/source/core/stringTable.h b/Engine/source/core/stringTable.h index 444ec7c24..1f1ae25bd 100644 --- a/Engine/source/core/stringTable.h +++ b/Engine/source/core/stringTable.h @@ -19,17 +19,16 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _STRINGTABLE_H_ #define _STRINGTABLE_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _DATACHUNKER_H_ -#include "core/dataChunker.h" -#endif +#include "core/util/tVector.h" +#include "core/dataChunker.h" + +extern template class Vector; //-------------------------------------- /// A global table for the hashing and tracking of strings. diff --git a/Engine/source/core/strings/findMatch.h b/Engine/source/core/strings/findMatch.h index ea964ea6e..149837a36 100644 --- a/Engine/source/core/strings/findMatch.h +++ b/Engine/source/core/strings/findMatch.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 _FINDMATCH_H_ #define _FINDMATCH_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif class FindMatch { diff --git a/Engine/source/core/strings/stringFunctions.h b/Engine/source/core/strings/stringFunctions.h index d1556f7a6..97fc6601a 100644 --- a/Engine/source/core/strings/stringFunctions.h +++ b/Engine/source/core/strings/stringFunctions.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 _STRINGFUNCTIONS_H_ #define _STRINGFUNCTIONS_H_ @@ -27,14 +29,9 @@ #include #include #include - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif -#ifndef _PLATFORMASSERT_H_ #include "platform/platformAssert.h" -#endif #if defined(TORQUE_OS_WIN) // These standard functions are not defined on Win32 and other Microsoft platforms... diff --git a/Engine/source/core/strings/stringUnit.h b/Engine/source/core/strings/stringUnit.h index e4a410762..ceb407db6 100644 --- a/Engine/source/core/strings/stringUnit.h +++ b/Engine/source/core/strings/stringUnit.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 _STRINGUNIT_H_ #define _STRINGUNIT_H_ diff --git a/Engine/source/core/strings/unicode.h b/Engine/source/core/strings/unicode.h index 009489630..2fd158c80 100644 --- a/Engine/source/core/strings/unicode.h +++ b/Engine/source/core/strings/unicode.h @@ -19,14 +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 _UNICODE_H_ #define _UNICODE_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif - /// Unicode conversion utility functions /// diff --git a/Engine/source/core/tAlgorithm.h b/Engine/source/core/tAlgorithm.h index defe6171f..57fe8af50 100644 --- a/Engine/source/core/tAlgorithm.h +++ b/Engine/source/core/tAlgorithm.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 _TALGORITHM_H_ #define _TALGORITHM_H_ diff --git a/Engine/source/core/tSparseArray.h b/Engine/source/core/tSparseArray.h index 4f3800447..6a11fe709 100644 --- a/Engine/source/core/tSparseArray.h +++ b/Engine/source/core/tSparseArray.h @@ -19,17 +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 _TSPARSEARRAY_H_ #define _TSPARSEARRAY_H_ //Includes -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _PLATFORMASSERT_H_ + #include "platform/platformAssert.h" -#endif template class SparseArray diff --git a/Engine/source/core/tagDictionary.h b/Engine/source/core/tagDictionary.h index 9d923c3a4..9120d4dc3 100644 --- a/Engine/source/core/tagDictionary.h +++ b/Engine/source/core/tagDictionary.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 _TAGDICTIONARY_H_ #define _TAGDICTIONARY_H_ - -#ifndef _STRINGTABLE_H_ #include "core/stringTable.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif class Stream; diff --git a/Engine/source/core/threadStatic.h b/Engine/source/core/threadStatic.h index 29d63731e..a7e1cf48a 100644 --- a/Engine/source/core/threadStatic.h +++ b/Engine/source/core/threadStatic.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 _TORQUETHREADSTATIC_H_ #define _TORQUETHREADSTATIC_H_ diff --git a/Engine/source/core/tokenizer.h b/Engine/source/core/tokenizer.h index 4a0bf476d..d92aab87e 100644 --- a/Engine/source/core/tokenizer.h +++ b/Engine/source/core/tokenizer.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 _TOKENIZER_H_ #define _TOKENIZER_H_ //Includes -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _STREAM_H_ #include "core/stream/stream.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif class SizedStream; diff --git a/Engine/source/core/util/autoPtr.h b/Engine/source/core/util/autoPtr.h index 446934e9a..21cdff599 100644 --- a/Engine/source/core/util/autoPtr.h +++ b/Engine/source/core/util/autoPtr.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 _AUTOPTR_H_ #define _AUTOPTR_H_ diff --git a/Engine/source/core/util/byteBuffer.h b/Engine/source/core/util/byteBuffer.h index 79751aad0..64daa76bb 100644 --- a/Engine/source/core/util/byteBuffer.h +++ b/Engine/source/core/util/byteBuffer.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 _BYTEBUFFER_H_ #define _BYTEBUFFER_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif namespace Torque { diff --git a/Engine/source/core/util/delegate.h b/Engine/source/core/util/delegate.h index 0b1e51ec5..43818fd75 100644 --- a/Engine/source/core/util/delegate.h +++ b/Engine/source/core/util/delegate.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 _UTIL_DELEGATE_H_ #define _UTIL_DELEGATE_H_ diff --git a/Engine/source/core/util/dxt5nmSwizzle.h b/Engine/source/core/util/dxt5nmSwizzle.h index 26ce6ccc8..4513fb272 100644 --- a/Engine/source/core/util/dxt5nmSwizzle.h +++ b/Engine/source/core/util/dxt5nmSwizzle.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 _DXT5nm_SWIZZLE_H_ #define _DXT5nm_SWIZZLE_H_ diff --git a/Engine/source/core/util/endian.h b/Engine/source/core/util/endian.h index eaff3c03c..5c2181421 100644 --- a/Engine/source/core/util/endian.h +++ b/Engine/source/core/util/endian.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 _ENDIAN_H_ #define _ENDIAN_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif //------------------------------------------------------------------------------ // Endian conversions diff --git a/Engine/source/core/util/hashFunction.h b/Engine/source/core/util/hashFunction.h index 02ecd019b..c65cfdfe5 100644 --- a/Engine/source/core/util/hashFunction.h +++ b/Engine/source/core/util/hashFunction.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 _HASHFUNCTION_H_ #define _HASHFUNCTION_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif namespace Torque { diff --git a/Engine/source/core/util/journal/journal.h b/Engine/source/core/util/journal/journal.h index 6f64648ca..0b1ca7b2e 100644 --- a/Engine/source/core/util/journal/journal.h +++ b/Engine/source/core/util/journal/journal.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 _UTIL_JOURNAL_JOURNAL_H_ #define _UTIL_JOURNAL_JOURNAL_H_ diff --git a/Engine/source/core/util/journal/journaledSignal.h b/Engine/source/core/util/journal/journaledSignal.h index 2c9079bd3..13fd3f1c7 100644 --- a/Engine/source/core/util/journal/journaledSignal.h +++ b/Engine/source/core/util/journal/journaledSignal.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 _JOURNALEDSIGNAL_H_ #define _JOURNALEDSIGNAL_H_ - -#ifndef _UTIL_JOURNAL_JOURNAL_H_ #include "core/util/journal/journal.h" -#endif -#ifndef _TSIGNAL_H_ + #include "core/util/tSignal.h" -#endif template class JournaledSignal; diff --git a/Engine/source/core/util/journal/process.h b/Engine/source/core/util/journal/process.h index d5633558c..0da74b37b 100644 --- a/Engine/source/core/util/journal/process.h +++ b/Engine/source/core/util/journal/process.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 _UTIL_JOURNAL_PROCESS_H_ #define _UTIL_JOURNAL_PROCESS_H_ diff --git a/Engine/source/core/util/namedSingleton.h b/Engine/source/core/util/namedSingleton.h index 2c14812be..d5987afce 100644 --- a/Engine/source/core/util/namedSingleton.h +++ b/Engine/source/core/util/namedSingleton.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 _TORQUE_CORE_UTIL_NAMEDSINGLETON_H_ #define _TORQUE_CORE_UTIL_NAMEDSINGLETON_H_ diff --git a/Engine/source/core/util/noncopyable.h b/Engine/source/core/util/noncopyable.h index 6518d598a..adfaedbb7 100644 --- a/Engine/source/core/util/noncopyable.h +++ b/Engine/source/core/util/noncopyable.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 _CORE_NONCOPYABLE_H_ #define _CORE_NONCOPYABLE_H_ diff --git a/Engine/source/core/util/path.h b/Engine/source/core/util/path.h index 49875f4b6..4f04db51c 100644 --- a/Engine/source/core/util/path.h +++ b/Engine/source/core/util/path.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 _PATH_H_ #define _PATH_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif namespace Torque { diff --git a/Engine/source/core/util/rawData.h b/Engine/source/core/util/rawData.h index cce67b73f..9763a0cb9 100644 --- a/Engine/source/core/util/rawData.h +++ b/Engine/source/core/util/rawData.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 _RAWDATA_H_ #define _RAWDATA_H_ diff --git a/Engine/source/core/util/refBase.h b/Engine/source/core/util/refBase.h index fedb6869a..c0e17f8a3 100644 --- a/Engine/source/core/util/refBase.h +++ b/Engine/source/core/util/refBase.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 _REFBASE_H_ #define _REFBASE_H_ diff --git a/Engine/source/core/util/rgb2luv.h b/Engine/source/core/util/rgb2luv.h index 7685cc969..88dc2357a 100644 --- a/Engine/source/core/util/rgb2luv.h +++ b/Engine/source/core/util/rgb2luv.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 _RGB2LUV_H_ #define _RGB2LUV_H_ - -#ifndef _COLOR_H_ #include "core/color.h" -#endif namespace ConvertRGB { diff --git a/Engine/source/core/util/rgb2xyz.h b/Engine/source/core/util/rgb2xyz.h index 18ae0d227..3279e734f 100644 --- a/Engine/source/core/util/rgb2xyz.h +++ b/Engine/source/core/util/rgb2xyz.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 _RGB2XYZ_H_ #define _RGB2XYZ_H_ diff --git a/Engine/source/core/util/safeCast.h b/Engine/source/core/util/safeCast.h index 6a82488a7..b4cd86c80 100644 --- a/Engine/source/core/util/safeCast.h +++ b/Engine/source/core/util/safeCast.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 _TORQUE_CORE_UTIL_SAFECAST_H_ #define _TORQUE_CORE_UTIL_SAFECAST_H_ diff --git a/Engine/source/core/util/safeDelete.h b/Engine/source/core/util/safeDelete.h index 325ef5385..cb8b68d54 100644 --- a/Engine/source/core/util/safeDelete.h +++ b/Engine/source/core/util/safeDelete.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 _TORQUE_SAFEDELETE_H_ #define _TORQUE_SAFEDELETE_H_ diff --git a/Engine/source/core/util/str.h b/Engine/source/core/util/str.h index 827ba0c1f..dfab1ab3f 100644 --- a/Engine/source/core/util/str.h +++ b/Engine/source/core/util/str.h @@ -19,15 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TORQUE_STRING_H_ #define _TORQUE_STRING_H_ #include - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif #include diff --git a/Engine/source/core/util/swizzle.h b/Engine/source/core/util/swizzle.h index 1c3d723a7..f17d13ceb 100644 --- a/Engine/source/core/util/swizzle.h +++ b/Engine/source/core/util/swizzle.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 _SWIZZLE_H_ #define _SWIZZLE_H_ diff --git a/Engine/source/core/util/swizzleSpec.h b/Engine/source/core/util/swizzleSpec.h index ee0259ac4..82580a5c6 100644 --- a/Engine/source/core/util/swizzleSpec.h +++ b/Engine/source/core/util/swizzleSpec.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 _SWIZZLESPEC_H_ #define _SWIZZLESPEC_H_ diff --git a/Engine/source/core/util/tAlignedArray.h b/Engine/source/core/util/tAlignedArray.h index b3fa785c3..913fe90b6 100644 --- a/Engine/source/core/util/tAlignedArray.h +++ b/Engine/source/core/util/tAlignedArray.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 _ALIGNEDARRAY_H_ #define _ALIGNEDARRAY_H_ diff --git a/Engine/source/core/util/tDictionary.h b/Engine/source/core/util/tDictionary.h index c40d372f3..2aef93495 100644 --- a/Engine/source/core/util/tDictionary.h +++ b/Engine/source/core/util/tDictionary.h @@ -19,24 +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 _TDICTIONARY_H_ #define _TDICTIONARY_H_ - -#ifndef _STRINGFUNCTIONS_H_ #include "core/strings/stringFunctions.h" -#endif -#ifndef _HASHFUNCTION_H_ + #include "core/util/hashFunction.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif - // TODO: Maybe move these into a more general Tuple class? diff --git a/Engine/source/core/util/tFixedSizeDeque.h b/Engine/source/core/util/tFixedSizeDeque.h index 2d6c65ff9..37504fe56 100644 --- a/Engine/source/core/util/tFixedSizeDeque.h +++ b/Engine/source/core/util/tFixedSizeDeque.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 _TFIXEDSIZEDEQUE_H_ #define _TFIXEDSIZEDEQUE_H_ diff --git a/Engine/source/core/util/tFixedSizeVector.h b/Engine/source/core/util/tFixedSizeVector.h index fedd12587..53dad80a7 100644 --- a/Engine/source/core/util/tFixedSizeVector.h +++ b/Engine/source/core/util/tFixedSizeVector.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 _TFIXEDSIZEVECTOR_H_ #define _TFIXEDSIZEVECTOR_H_ diff --git a/Engine/source/core/util/tList.h b/Engine/source/core/util/tList.h index 3c838d5d0..28ca846ba 100644 --- a/Engine/source/core/util/tList.h +++ b/Engine/source/core/util/tList.h @@ -22,10 +22,7 @@ #ifndef _TORQUE_LIST_ #define _TORQUE_LIST_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif namespace Torque { diff --git a/Engine/source/core/util/tNamedFactory.h b/Engine/source/core/util/tNamedFactory.h index 5391626b5..b048eb713 100644 --- a/Engine/source/core/util/tNamedFactory.h +++ b/Engine/source/core/util/tNamedFactory.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _TFACTORY_H_ #define _TFACTORY_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif - /// A helper template class for registering creation /// methods to name strings. diff --git a/Engine/source/core/util/tSignal.h b/Engine/source/core/util/tSignal.h index 0d3781569..b4aa97322 100644 --- a/Engine/source/core/util/tSignal.h +++ b/Engine/source/core/util/tSignal.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 _TSIGNAL_H_ #define _TSIGNAL_H_ - -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif /// Signals (Multi-cast Delegates) /// diff --git a/Engine/source/core/util/tSingleton.h b/Engine/source/core/util/tSingleton.h index 14790d3c2..032a9b43a 100644 --- a/Engine/source/core/util/tSingleton.h +++ b/Engine/source/core/util/tSingleton.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 _TSINGLETON_H_ #define _TSINGLETON_H_ - -#ifndef _PLATFORMASSERT_H_ #include "platform/platformAssert.h" -#endif /// This is a simple thread safe singleton class based on the /// design of boost::singleton_default (see http://www.boost.org/). diff --git a/Engine/source/core/util/tUnmanagedVector.h b/Engine/source/core/util/tUnmanagedVector.h index 3e18a441d..fe946ac0b 100644 --- a/Engine/source/core/util/tUnmanagedVector.h +++ b/Engine/source/core/util/tUnmanagedVector.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 _TUNMANAGEDVECTOR_H_ #define _TUNMANAGEDVECTOR_H_ diff --git a/Engine/source/core/util/tVector.h b/Engine/source/core/util/tVector.h index c7c4fc7a4..c5a68728c 100644 --- a/Engine/source/core/util/tVector.h +++ b/Engine/source/core/util/tVector.h @@ -19,15 +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 _TVECTOR_H_ #define _TVECTOR_H_ // TODO: This shouldn't be included in headers... it should // be included by the source file before all other includes. -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif + #include #include "console/engineTypes.h" #include "console/engineTypeInfo.h" @@ -992,9 +993,7 @@ public: }; // Include vector specializations -#ifndef _TVECTORSPEC_H_ #include "core/util/tVectorSpecializations.h" -#endif #endif //_TVECTOR_H_ diff --git a/Engine/source/core/util/tVectorSpecializations.h b/Engine/source/core/util/tVectorSpecializations.h index 8f9970fc6..8232071b3 100644 --- a/Engine/source/core/util/tVectorSpecializations.h +++ b/Engine/source/core/util/tVectorSpecializations.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 _TVECTORSPEC_H_ #define _TVECTORSPEC_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif // Not exactly a specialization, just a vector to use when speed is a concern template diff --git a/Engine/source/core/util/timeClass.h b/Engine/source/core/util/timeClass.h index cfee70a86..229fe46e0 100644 --- a/Engine/source/core/util/timeClass.h +++ b/Engine/source/core/util/timeClass.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 _TIMECLASS_H_ #define _TIMECLASS_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif -#ifndef _PLATFORM_H_ + #include "platform/platform.h" -#endif #if defined(TORQUE_COMPILER_VISUALC) #define TORQUE_CONSTANT_S64(a) (a##I64) diff --git a/Engine/source/core/util/timeSource.h b/Engine/source/core/util/timeSource.h index 991a6aa50..bcd3902b9 100644 --- a/Engine/source/core/util/timeSource.h +++ b/Engine/source/core/util/timeSource.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 _TIMESOURCE_H_ #define _TIMESOURCE_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TSTREAM_H_ #include "core/stream/tStream.h" -#endif -#ifndef _SIM_H_ #include "console/sim.h" -#endif - /// Timer that queries the real-time ticker. struct RealMSTimer diff --git a/Engine/source/core/util/uuid.h b/Engine/source/core/util/uuid.h index e4b5b17d2..5ba4f9929 100644 --- a/Engine/source/core/util/uuid.h +++ b/Engine/source/core/util/uuid.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 _TORQUE_UUID_H_ #define _TORQUE_UUID_H_ diff --git a/Engine/source/core/util/zip/centralDir.h b/Engine/source/core/util/zip/centralDir.h index e679c67af..84780823c 100644 --- a/Engine/source/core/util/zip/centralDir.h +++ b/Engine/source/core/util/zip/centralDir.h @@ -21,6 +21,8 @@ //----------------------------------------------------------------------------- #include "core/util/zip/fileHeader.h" +#pragma once +#pragma once #ifndef _CENTRALDIR_H_ #define _CENTRALDIR_H_ diff --git a/Engine/source/core/util/zip/compressor.h b/Engine/source/core/util/zip/compressor.h index 0def7e4f9..e9bf62e82 100644 --- a/Engine/source/core/util/zip/compressor.h +++ b/Engine/source/core/util/zip/compressor.h @@ -21,6 +21,8 @@ //----------------------------------------------------------------------------- #include "core/util/zip/centralDir.h" +#pragma once +#pragma once #ifndef _COMPRESSOR_H_ #define _COMPRESSOR_H_ diff --git a/Engine/source/core/util/zip/crctab.h b/Engine/source/core/util/zip/crctab.h index 3c8f4818a..881ed4984 100644 --- a/Engine/source/core/util/zip/crctab.h +++ b/Engine/source/core/util/zip/crctab.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 _CRCTAB_H_ #define _CRCTAB_H_ diff --git a/Engine/source/core/util/zip/extraField.h b/Engine/source/core/util/zip/extraField.h index b9958f46e..da93cbee6 100644 --- a/Engine/source/core/util/zip/extraField.h +++ b/Engine/source/core/util/zip/extraField.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 _EXTRAFIELD_H_ #define _EXTRAFIELD_H_ diff --git a/Engine/source/core/util/zip/fileHeader.h b/Engine/source/core/util/zip/fileHeader.h index 0a7bf03be..2f269fbe6 100644 --- a/Engine/source/core/util/zip/fileHeader.h +++ b/Engine/source/core/util/zip/fileHeader.h @@ -22,6 +22,8 @@ #include "core/util/zip/extraField.h" #include "core/util/tVector.h" +#pragma once +#pragma once #ifndef _FILEHEADER_H_ #define _FILEHEADER_H_ diff --git a/Engine/source/core/util/zip/zipArchive.h b/Engine/source/core/util/zip/zipArchive.h index 1a05df368..73fb2d684 100644 --- a/Engine/source/core/util/zip/zipArchive.h +++ b/Engine/source/core/util/zip/zipArchive.h @@ -29,6 +29,8 @@ #include "core/util/tVector.h" #include "core/util/tDictionary.h" #include "core/util/timeClass.h" +#pragma once +#pragma once #ifndef _ZIPARCHIVE_H_ #define _ZIPARCHIVE_H_ diff --git a/Engine/source/core/util/zip/zipCryptStream.h b/Engine/source/core/util/zip/zipCryptStream.h index 88694b1b1..570d04f57 100644 --- a/Engine/source/core/util/zip/zipCryptStream.h +++ b/Engine/source/core/util/zip/zipCryptStream.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 _ZIPCRYPTSTREAM_H_ #define _ZIPCRYPTSTREAM_H_ - -#ifndef _FILTERSTREAM_H_ #include "core/filterStream.h" -#endif class ZipCryptRStream : public FilterStream { diff --git a/Engine/source/core/util/zip/zipObject.h b/Engine/source/core/util/zip/zipObject.h index cc99b14dc..0b66b7638 100644 --- a/Engine/source/core/util/zip/zipObject.h +++ b/Engine/source/core/util/zip/zipObject.h @@ -25,6 +25,8 @@ #include "core/util/tVector.h" #include "core/stream/streamObject.h" #include "core/util/str.h" +#pragma once +#pragma once #ifndef _ZIPOBJECT_H_ #define _ZIPOBJECT_H_ diff --git a/Engine/source/core/util/zip/zipStatFilter.h b/Engine/source/core/util/zip/zipStatFilter.h index e37184e1a..33cfd656c 100644 --- a/Engine/source/core/util/zip/zipStatFilter.h +++ b/Engine/source/core/util/zip/zipStatFilter.h @@ -33,6 +33,8 @@ // time to complete. With compression done on the fly the time consuming code // is pushed out to when writing to files, which is significantly easier to // do asynchronously. +#pragma once +#pragma once #ifndef _ZIPSTATFILTER_H_ #define _ZIPSTATFILTER_H_ diff --git a/Engine/source/core/util/zip/zipSubStream.h b/Engine/source/core/util/zip/zipSubStream.h index 395d9960f..b1c3dab3f 100644 --- a/Engine/source/core/util/zip/zipSubStream.h +++ b/Engine/source/core/util/zip/zipSubStream.h @@ -19,14 +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 _ZIPSUBSTREAM_H_ #define _ZIPSUBSTREAM_H_ //Includes -#ifndef _FILTERSTREAM_H_ #include "core/filterStream.h" -#endif struct z_stream_s; diff --git a/Engine/source/core/util/zip/zipTempStream.h b/Engine/source/core/util/zip/zipTempStream.h index ca1771075..5d64c9fc3 100644 --- a/Engine/source/core/util/zip/zipTempStream.h +++ b/Engine/source/core/util/zip/zipTempStream.h @@ -22,6 +22,8 @@ #include "core/util/zip/zipArchive.h" #include "core/util/str.h" +#pragma once +#pragma once #ifndef _ZIPTEMPSTREAM_H_ #define _ZIPTEMPSTREAM_H_ diff --git a/Engine/source/core/util/zip/zipVolume.h b/Engine/source/core/util/zip/zipVolume.h index 99c2cc089..4f8cae5ba 100644 --- a/Engine/source/core/util/zip/zipVolume.h +++ b/Engine/source/core/util/zip/zipVolume.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 _CORE_ZIP_VOLUME_H_ #define _CORE_ZIP_VOLUME_H_ diff --git a/Engine/source/core/virtualMountSystem.h b/Engine/source/core/virtualMountSystem.h index 14824a886..ad42387c2 100644 --- a/Engine/source/core/virtualMountSystem.h +++ b/Engine/source/core/virtualMountSystem.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 _CORE_VMS_H_ #define _CORE_VMS_H_ diff --git a/Engine/source/core/volume.h b/Engine/source/core/volume.h index 86242adf4..03160dfde 100644 --- a/Engine/source/core/volume.h +++ b/Engine/source/core/volume.h @@ -19,37 +19,25 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _VOLUME_H_ #define _VOLUME_H_ - -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif #ifndef _TORQUE_LIST_ #include "core/util/tList.h" #endif - -#ifndef _PATH_H_ #include "core/util/path.h" -#endif -#ifndef _TIMECLASS_H_ #include "core/util/timeClass.h" -#endif namespace Torque { diff --git a/Engine/source/environment/VolumetricFog.h b/Engine/source/environment/VolumetricFog.h index 98021194d..758548745 100644 --- a/Engine/source/environment/VolumetricFog.h +++ b/Engine/source/environment/VolumetricFog.h @@ -19,37 +19,27 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _VolumetricFog_H_ #define _VolumetricFog_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _MATTEXTURETARGET_H_ -#include "materials/matTextureTarget.h" -#endif -#ifndef _GFXSHADER_H_ -#include "gfx/gfxShader.h" -#endif -#ifndef _GFXTARGET_H_ -#include "gfx/gfxTarget.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ -#include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _TSSHAPE_H_ -#include "ts/tsShape.h" -#endif -#ifndef _POST_EFFECT_H_ -#include "postFx/postEffect.h" -#endif - -#include "gui/core/guiCanvas.h" -#ifndef _ASSET_PTR_H_ +#include "materials/matTextureTarget.h" + +#include "gfx/gfxShader.h" + +#include "gfx/gfxTarget.h" + +#include "gfx/gfxVertexBuffer.h" + +#include "ts/tsShape.h" +#include "postFx/postEffect.h" + +#include "gui/core/guiCanvas.h" #include "assets/assetPtr.h" -#endif + #ifndef SHAPEASSET_H #include "T3D/assets/ShapeAsset.h" #endif diff --git a/Engine/source/environment/VolumetricFogRTManager.h b/Engine/source/environment/VolumetricFogRTManager.h index 021fd66f9..973ec2aa7 100644 --- a/Engine/source/environment/VolumetricFogRTManager.h +++ b/Engine/source/environment/VolumetricFogRTManager.h @@ -19,23 +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 _VolumetricFogRTManager_H_ #define _VolumetricFogRTManager_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif -#ifndef _GFXTARGET_H_ + #include "gfx/gfxTarget.h" -#endif -#ifndef _SIGNAL_H_ + #include "core/util/tSignal.h" -#endif - + class VolumetricFogRTManager; typedef Signal VolumetricFogRTMResizeSignal; diff --git a/Engine/source/environment/basicClouds.h b/Engine/source/environment/basicClouds.h index 1fb2d06e0..27dd74757 100644 --- a/Engine/source/environment/basicClouds.h +++ b/Engine/source/environment/basicClouds.h @@ -19,28 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _BASICCLOUDS_H_ #define _BASICCLOUDS_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _GFXSHADER_H_ + #include "gfx/gfxShader.h" -#endif #include "T3D/assets/ImageAsset.h" diff --git a/Engine/source/environment/cloudLayer.h b/Engine/source/environment/cloudLayer.h index 3f7dca6b4..39e45d80a 100644 --- a/Engine/source/environment/cloudLayer.h +++ b/Engine/source/environment/cloudLayer.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 _CLOUDLAYER_H_ #define _CLOUDLAYER_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _MATINSTANCE_H_ + #include "materials/matInstance.h" -#endif #include "T3D/assets/ImageAsset.h" diff --git a/Engine/source/environment/decalRoad.h b/Engine/source/environment/decalRoad.h index e64c28256..d7d49983c 100644 --- a/Engine/source/environment/decalRoad.h +++ b/Engine/source/environment/decalRoad.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 _DECALROAD_H_ #define _DECALROAD_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 _CLIPPEDPOLYLIST_H_ + #include "collision/clippedPolyList.h" -#endif #include "T3D/assets/MaterialAsset.h" diff --git a/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h b/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h index 96098273c..4aba6c1e1 100644 --- a/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h +++ b/Engine/source/environment/editors/guiMeshRoadEditorCtrl.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 _GUIMESHROADEDITORCTRL_H_ #define _GUIMESHROADEDITORCTRL_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _GIZMO_H_ + #include "gui/worldEditor/gizmo.h" -#endif -#ifndef _MESHROAD_H_ + #include "environment/meshRoad.h" -#endif #include "T3D/assets/MaterialAsset.h" diff --git a/Engine/source/environment/editors/guiRiverEditorCtrl.h b/Engine/source/environment/editors/guiRiverEditorCtrl.h index 29938513c..c60a845dc 100644 --- a/Engine/source/environment/editors/guiRiverEditorCtrl.h +++ b/Engine/source/environment/editors/guiRiverEditorCtrl.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 _GUIRIVEREDITORCTRL_H_ #define _GUIRIVEREDITORCTRL_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _RIVER_H_ + #include "environment/river.h" -#endif -#ifndef _GIZMO_H_ + #include "gui/worldEditor/gizmo.h" -#endif struct ObjectRenderInst; class SceneManager; diff --git a/Engine/source/environment/editors/guiRoadEditorCtrl.h b/Engine/source/environment/editors/guiRoadEditorCtrl.h index 39a109b84..d66489f6a 100644 --- a/Engine/source/environment/editors/guiRoadEditorCtrl.h +++ b/Engine/source/environment/editors/guiRoadEditorCtrl.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 _GUIROADEDITORCTRL_H_ #define _GUIROADEDITORCTRL_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _DECALROAD_H_ + #include "environment/decalRoad.h" -#endif class GameBase; class DecalRoad; diff --git a/Engine/source/environment/meshRoad.h b/Engine/source/environment/meshRoad.h index 437d76a6d..9bb908bcc 100644 --- a/Engine/source/environment/meshRoad.h +++ b/Engine/source/environment/meshRoad.h @@ -24,31 +24,24 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _MESHROAD_H_ #define _MESHROAD_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _CLIPPEDPOLYLIST_H_ + #include "collision/clippedPolyList.h" -#endif -#ifndef _MATINSTANCE_H_ + #include "materials/matInstance.h" -#endif -#ifndef _CONVEX_H_ + #include "collision/convex.h" -#endif #include "math/util/decomposePoly.h" diff --git a/Engine/source/environment/nodeListManager.h b/Engine/source/environment/nodeListManager.h index 39f5fb232..07e824b57 100644 --- a/Engine/source/environment/nodeListManager.h +++ b/Engine/source/environment/nodeListManager.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 _NODELISTMANAGER_H_ #define _NODELISTMANAGER_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MQUAT_H_ + #include "math/mQuat.h" -#endif -#ifndef _NETCONNECTION_H_ + #include "sim/netConnection.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/environment/river.h b/Engine/source/environment/river.h index 5676b7505..99674a3fa 100644 --- a/Engine/source/environment/river.h +++ b/Engine/source/environment/river.h @@ -19,33 +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 _RIVER_H_ #define _RIVER_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _CLIPPEDPOLYLIST_H_ + #include "collision/clippedPolyList.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _WATEROBJECT_H_ + #include "waterObject.h" -#endif - - //------------------------------------------------------------------------- // RiverSplineNode Class diff --git a/Engine/source/environment/scatterSky.h b/Engine/source/environment/scatterSky.h index aecfeab19..fc1e3b639 100644 --- a/Engine/source/environment/scatterSky.h +++ b/Engine/source/environment/scatterSky.h @@ -19,37 +19,28 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SCATTERSKY_H_ #define _SCATTERSKY_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _RENDERPASSMANAGER_H_ + #include "renderInstance/renderPassManager.h" -#endif -#ifndef _PRIMBUILDER_H_ + #include "gfx/primBuilder.h" -#endif -#ifndef _LIGHTINFO_H_ + #include "lighting/lightInfo.h" -#endif -#ifndef _LIGHTFLAREDATA_H_ + #include "T3D/lightFlareData.h" -#endif -#ifndef _TRESPONSECURVE_H_ + #include "math/util/tResponseCurve.h" -#endif #include "T3D/assets/MaterialAsset.h" diff --git a/Engine/source/environment/skyBox.h b/Engine/source/environment/skyBox.h index 6a59f133c..ea03d2c71 100644 --- a/Engine/source/environment/skyBox.h +++ b/Engine/source/environment/skyBox.h @@ -19,33 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SKYBOX_H_ #define _SKYBOX_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _CUBEMAPDATA_H_ #include "gfx/sim/cubemapData.h" -#endif -#ifndef _MATERIALLIST_H_ #include "materials/materialList.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ #include "gfx/gfxPrimitiveBuffer.h" -#endif #include "T3D/assets/MaterialAsset.h" diff --git a/Engine/source/environment/skySphere.h b/Engine/source/environment/skySphere.h index 7aeebb5f1..9fbe7c0b5 100644 --- a/Engine/source/environment/skySphere.h +++ b/Engine/source/environment/skySphere.h @@ -19,33 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SKYSPHERE_H_ #define _SKYSPHERE_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _CUBEMAPDATA_H_ #include "gfx/sim/cubemapData.h" -#endif -#ifndef _MATERIALLIST_H_ #include "materials/materialList.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ #include "gfx/gfxPrimitiveBuffer.h" -#endif #include "T3D/assets/MaterialAsset.h" diff --git a/Engine/source/environment/sun.h b/Engine/source/environment/sun.h index f47a5ecb9..3e9fb21eb 100644 --- a/Engine/source/environment/sun.h +++ b/Engine/source/environment/sun.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 _SUN_H_ #define _SUN_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _COLOR_H_ + #include "core/color.h" -#endif -#ifndef _LIGHTINFO_H_ + #include "lighting/lightInfo.h" -#endif -#ifndef _LIGHTFLAREDATA_H_ + #include "T3D/lightFlareData.h" -#endif #include "T3D/assets/MaterialAsset.h" diff --git a/Engine/source/environment/timeOfDay.h b/Engine/source/environment/timeOfDay.h index e4dfcc321..80bd8a3b2 100644 --- a/Engine/source/environment/timeOfDay.h +++ b/Engine/source/environment/timeOfDay.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 +#pragma once #ifndef _TIMEOFDAY_H_ #define _TIMEOFDAY_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif class Sun; class TimeOfDay; diff --git a/Engine/source/environment/waterBlock.h b/Engine/source/environment/waterBlock.h index 555a8a8a6..1def0ca5e 100644 --- a/Engine/source/environment/waterBlock.h +++ b/Engine/source/environment/waterBlock.h @@ -19,32 +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 _WATERBLOCK_H_ #define _WATERBLOCK_H_ - -#ifndef _GAMEBASE_H_ #include "T3D/gameBase/gameBase.h" -#endif -#ifndef _GFXDEVICE_H_ -#include "gfx/gfxDevice.h" -#endif -#ifndef _SCENEDATA_H_ -#include "materials/sceneData.h" -#endif -#ifndef _MATINSTANCE_H_ -#include "materials/matInstance.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ -#include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _RENDERPASSMANAGER_H_ -#include "renderInstance/renderPassManager.h" -#endif -#ifndef _WATEROBJECT_H_ -#include "waterObject.h" -#endif +#include "gfx/gfxDevice.h" + +#include "materials/sceneData.h" + +#include "materials/matInstance.h" + +#include "gfx/gfxPrimitiveBuffer.h" + +#include "renderInstance/renderPassManager.h" + +#include "waterObject.h" //***************************************************************************** // WaterBlock diff --git a/Engine/source/environment/waterObject.h b/Engine/source/environment/waterObject.h index c925f4a07..413e4a6aa 100644 --- a/Engine/source/environment/waterObject.h +++ b/Engine/source/environment/waterObject.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 _WATEROBJECT_H_ #define _WATEROBJECT_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _GFXSTRUCTS_H_ + #include "gfx/gfxStructs.h" -#endif -#ifndef _FOGSTRUCTS_H_ + #include "scene/fogStructs.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _REFLECTOR_H_ + #include "scene/reflector.h" -#endif -#ifndef _ALIGNEDARRAY_H_ + #include "core/util/tAlignedArray.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif #include "T3D/assets/ImageAsset.h" diff --git a/Engine/source/environment/waterPlane.h b/Engine/source/environment/waterPlane.h index 0f21166e0..3f9ac03bf 100644 --- a/Engine/source/environment/waterPlane.h +++ b/Engine/source/environment/waterPlane.h @@ -19,35 +19,25 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _WATERPLANE_H_ #define _WATERPLANE_H_ - -#ifndef _GAMEBASE_H_ #include "T3D/gameBase/gameBase.h" -#endif -#ifndef _GFXDEVICE_H_ -#include "gfx/gfxDevice.h" -#endif -#ifndef _SCENEDATA_H_ -#include "materials/sceneData.h" -#endif -#ifndef _MATINSTANCE_H_ -#include "materials/matInstance.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ -#include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _RENDERPASSMANAGER_H_ -#include "renderInstance/renderPassManager.h" -#endif -#ifndef _MATHUTIL_FRUSTUM_H_ -#include "math/util/frustum.h" -#endif -#ifndef _WATEROBJECT_H_ -#include "environment/waterObject.h" -#endif +#include "gfx/gfxDevice.h" + +#include "materials/sceneData.h" + +#include "materials/matInstance.h" + +#include "gfx/gfxPrimitiveBuffer.h" + +#include "renderInstance/renderPassManager.h" +#include "math/util/frustum.h" + +#include "environment/waterObject.h" //***************************************************************************** // WaterPlane diff --git a/Engine/source/forest/editor/forestBrushElement.h b/Engine/source/forest/editor/forestBrushElement.h index a5b14650d..ee3aa328d 100644 --- a/Engine/source/forest/editor/forestBrushElement.h +++ b/Engine/source/forest/editor/forestBrushElement.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 _FOREST_EDITOR_BRUSHELEMENT_H_ #define _FOREST_EDITOR_BRUSHELEMENT_H_ @@ -26,10 +27,7 @@ //#ifndef _SIMOBJECT_H_ //#include "console/simObject.h" //#endif -#ifndef _SIMSET_H_ #include "console/simSet.h" -#endif - //------------------------------------------------------------------------- // ForestBrushElement diff --git a/Engine/source/forest/editor/forestBrushTool.h b/Engine/source/forest/editor/forestBrushTool.h index c5f34ab39..f9414e21c 100644 --- a/Engine/source/forest/editor/forestBrushTool.h +++ b/Engine/source/forest/editor/forestBrushTool.h @@ -19,24 +19,16 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _FOREST_EDITOR_BRUSH_H_ #define _FOREST_EDITOR_BRUSH_H_ - -#ifndef _FOREST_EDITOR_TOOL_H_ #include "forest/editor/forestTool.h" -#endif -#ifndef _FORESTITEM_H_ + #include "forest/forestItem.h" -#endif -#ifndef _FOREST_EDITOR_BRUSHELEMENT_H_ #include "forest/editor/forestBrushElement.h" -#endif -#ifndef _COLOR_H_ + #include "core/color.h" -#endif - - class Forest; class ForestUndoAction; diff --git a/Engine/source/forest/editor/forestEditorCtrl.h b/Engine/source/forest/editor/forestEditorCtrl.h index d8fc6aae6..1f2905899 100644 --- a/Engine/source/forest/editor/forestEditorCtrl.h +++ b/Engine/source/forest/editor/forestEditorCtrl.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 #ifndef _FOREST_EDITOR_FORESTEDITORCTRL_H_ #define _FOREST_EDITOR_FORESTEDITORCTRL_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif #ifndef _H_FOREST_ #include "forest/forest.h" #endif - -#ifndef _FOREST_EDITOR_TOOL_H_ #include "forest/editor/forestTool.h" -#endif - class ForestEditorCtrl : public EditTSCtrl { diff --git a/Engine/source/forest/editor/forestSelectionTool.h b/Engine/source/forest/editor/forestSelectionTool.h index 90945c2b0..7fbd4dfa7 100644 --- a/Engine/source/forest/editor/forestSelectionTool.h +++ b/Engine/source/forest/editor/forestSelectionTool.h @@ -19,20 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _FOREST_EDITOR_SELECTIONTOOL_H_ #define _FOREST_EDITOR_SELECTIONTOOL_H_ - -#ifndef _FOREST_EDITOR_TOOL_H_ #include "forest/editor/forestTool.h" -#endif -#ifndef _FORESTITEM_H_ -#include "forest/forestItem.h" -#endif -#ifndef _TSELECTION_H_ -#include "gui/worldEditor/tSelection.h" -#endif +#include "forest/forestItem.h" + +#include "gui/worldEditor/tSelection.h" class Forest; class Gizmo; diff --git a/Engine/source/forest/editor/forestTool.h b/Engine/source/forest/editor/forestTool.h index be94d206e..5a5c378c7 100644 --- a/Engine/source/forest/editor/forestTool.h +++ b/Engine/source/forest/editor/forestTool.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 _FOREST_EDITOR_TOOL_H_ #define _FOREST_EDITOR_TOOL_H_ - -#ifndef _FORESTITEM_H_ #include "forest/forestItem.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif -#ifndef _GUITYPES_H_ + #include "gui/core/guiTypes.h" -#endif class Forest; class ForestEditorCtrl; diff --git a/Engine/source/forest/editor/forestUndo.h b/Engine/source/forest/editor/forestUndo.h index bf85e811c..722047f46 100644 --- a/Engine/source/forest/editor/forestUndo.h +++ b/Engine/source/forest/editor/forestUndo.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 #ifndef _FOREST_EDITOR_UNDO_H_ #define _FOREST_EDITOR_UNDO_H_ - -#ifndef _UNDO_H_ #include "util/undo.h" -#endif -#ifndef _FORESTITEM_H_ + #include "forest/forestItem.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif diff --git a/Engine/source/forest/forestCell.h b/Engine/source/forest/forestCell.h index 4133e06cd..a36a9a8b0 100644 --- a/Engine/source/forest/forestCell.h +++ b/Engine/source/forest/forestCell.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 _FORESTCELL_H_ #define _FORESTCELL_H_ - -#ifndef _FORESTITEM_H_ #include "forest/forestItem.h" -#endif + #ifndef _H_FOREST_ #include "forest/forest.h" #endif -#ifndef _BITVECTOR_H_ #include "core/bitVector.h" -#endif class ForestCellBatch; class SceneRenderState; diff --git a/Engine/source/forest/forestCellBatch.h b/Engine/source/forest/forestCellBatch.h index 8b021778a..77c627dca 100644 --- a/Engine/source/forest/forestCellBatch.h +++ b/Engine/source/forest/forestCellBatch.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 _FORESTCELLBATCH_H_ #define _FORESTCELLBATCH_H_ diff --git a/Engine/source/forest/forestCollision.h b/Engine/source/forest/forestCollision.h index 4628ab290..6cc5ab7bb 100644 --- a/Engine/source/forest/forestCollision.h +++ b/Engine/source/forest/forestCollision.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 _FORESTCOLLISION_H_ #define _FORESTCOLLISION_H_ - -#ifndef _CONVEX_H_ #include "collision/convex.h" -#endif -#ifndef _COLLISION_H_ -#include "collision/collision.h" -#endif +#include "collision/collision.h" class Forest; class ForestItem; diff --git a/Engine/source/forest/forestDataFile.h b/Engine/source/forest/forestDataFile.h index 0104a4d9e..9dd68069f 100644 --- a/Engine/source/forest/forestDataFile.h +++ b/Engine/source/forest/forestDataFile.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 _FORESTDATAFILE_H_ #define _FORESTDATAFILE_H_ - -#ifndef _FORESTITEM_H_ #include "forest/forestItem.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif class ForestCell; class Forest; diff --git a/Engine/source/forest/forestItem.h b/Engine/source/forest/forestItem.h index fb2258cf0..9d851e433 100644 --- a/Engine/source/forest/forestItem.h +++ b/Engine/source/forest/forestItem.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 +#pragma once #ifndef _FORESTITEM_H_ #define _FORESTITEM_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif -#ifndef _DYNAMIC_CONSOLETYPES_H_ #include "console/dynamicTypes.h" -#endif #include "T3D/assets/ShapeAsset.h" diff --git a/Engine/source/forest/forestWindAccumulator.h b/Engine/source/forest/forestWindAccumulator.h index 7322f9cbc..2adfd9a50 100644 --- a/Engine/source/forest/forestWindAccumulator.h +++ b/Engine/source/forest/forestWindAccumulator.h @@ -19,14 +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 _FORESTWINDACCUMULATOR_H_ #define _FORESTWINDACCUMULATOR_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif - struct TreePlacementInfo; class ForestItemData; diff --git a/Engine/source/forest/forestWindEmitter.h b/Engine/source/forest/forestWindEmitter.h index 4597ad5ca..35d0ad4cc 100644 --- a/Engine/source/forest/forestWindEmitter.h +++ b/Engine/source/forest/forestWindEmitter.h @@ -19,27 +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 _FORESTWINDEMITTER_H_ #define _FORESTWINDEMITTER_H_ - - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _MMATRIX_H_ -#include "math/mMatrix.h" -#endif -#ifndef _MPOINT3_H_ -#include "math/mPoint3.h" -#endif -#ifndef _MSPHERE_H_ -#include "math/mSphere.h" -#endif -#ifndef _TVECTOR_H_ -#include "core/util/tVector.h" -#endif +#include "math/mMatrix.h" + +#include "math/mPoint3.h" + +#include "math/mSphere.h" + +#include "core/util/tVector.h" class ForestWindEmitter; class ForestWindAccumulator; diff --git a/Engine/source/forest/forestWindMgr.h b/Engine/source/forest/forestWindMgr.h index 3258ed8f6..ac42ca670 100644 --- a/Engine/source/forest/forestWindMgr.h +++ b/Engine/source/forest/forestWindMgr.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 _FORESTWINDMGR_H_ #define _FORESTWINDMGR_H_ - -#ifndef _FORESTWINDEMITTER_H_ #include "forest/forestWindEmitter.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif -#ifndef _ITICKABLE_H_ + #include "core/iTickable.h" -#endif -#ifndef _FORESTITEM_H_ + #include "forest/forestItem.h" -#endif -#ifndef _TSINGLETON_H_ + #include "core/util/tSingleton.h" -#endif struct TreePlacementInfo { diff --git a/Engine/source/forest/glsl/windDeformationGLSL.h b/Engine/source/forest/glsl/windDeformationGLSL.h index 5fe6b4a75..c246b3b7f 100644 --- a/Engine/source/forest/glsl/windDeformationGLSL.h +++ b/Engine/source/forest/glsl/windDeformationGLSL.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 _FOREST_SHADERGEN_WINDDEFORMATIONGLSL_H_ #define _FOREST_SHADERGEN_WINDDEFORMATIONGLSL_H_ - -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _FEATURETYPE_H_ + #include "materials/materialFeatureTypes.h" -#endif class GFXShaderConstHandle; diff --git a/Engine/source/forest/hlsl/windDeformationHLSL.h b/Engine/source/forest/hlsl/windDeformationHLSL.h index 99aa49fe0..4d46e2ebb 100644 --- a/Engine/source/forest/hlsl/windDeformationHLSL.h +++ b/Engine/source/forest/hlsl/windDeformationHLSL.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 _FOREST_SHADERGEN_WINDDEFORMATIONHLSL_H_ #define _FOREST_SHADERGEN_WINDDEFORMATIONHLSL_H_ - -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _FEATURETYPE_H_ + #include "materials/materialFeatureTypes.h" -#endif class GFXShaderConstHandle; diff --git a/Engine/source/forest/ts/tsForestCellBatch.h b/Engine/source/forest/ts/tsForestCellBatch.h index 2283bd439..71a69b90c 100644 --- a/Engine/source/forest/ts/tsForestCellBatch.h +++ b/Engine/source/forest/ts/tsForestCellBatch.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 _TSFORESTCELLBATCH_H_ #define _TSFORESTCELLBATCH_H_ - -#ifndef _IMPOSTERRENDERMGR_H_ #include "renderInstance/renderImposterMgr.h" -#endif -#ifndef _FORESTCELLBATCH_H_ + #include "forest/forestCellBatch.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXSTRUCTS_H_ + #include "gfx/gfxStructs.h" -#endif class GFXShader; diff --git a/Engine/source/forest/ts/tsForestItemData.h b/Engine/source/forest/ts/tsForestItemData.h index 46b4c33c7..0625f77f4 100644 --- a/Engine/source/forest/ts/tsForestItemData.h +++ b/Engine/source/forest/ts/tsForestItemData.h @@ -19,20 +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 _TSFORESTITEMDATA_H_ #define _TSFORESTITEMDATA_H_ - -#ifndef _FORESTITEM_H_ #include "forest/forestItem.h" -#endif -#ifndef _TSSHAPE_H_ -#include "ts/tsShape.h" -#endif -#ifndef _RESOURCEMANAGER_H_ -#include "core/resourceManager.h" -#endif +#include "ts/tsShape.h" + +#include "core/resourceManager.h" class TSShapeInstance; class TSLastDetail; diff --git a/Engine/source/forest/windDeformation.h b/Engine/source/forest/windDeformation.h index 8ec644634..12e23311a 100644 --- a/Engine/source/forest/windDeformation.h +++ b/Engine/source/forest/windDeformation.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 _FOREST_SHADERGEN_WINDDEFORMATION_H_ #define _FOREST_SHADERGEN_WINDDEFORMATION_H_ - -#ifndef _SHADERGEN_H_ #include "shaderGen/shaderGen.h" -#endif -#ifndef _FEATURETYPE_H_ + #include "materials/materialFeatureTypes.h" -#endif class GFXShaderConstHandle; diff --git a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h index 06b6e90dd..b698ff513 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h +++ b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.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 _GFXD3D11CARDPROFILER_H_ #define _GFXD3D11CARDPROFILER_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h b/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h index 79564e8ec..875481045 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Cubemap.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 _GFXD3D11CUBEMAP_H_ #define _GFXD3D11CUBEMAP_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11Device.h b/Engine/source/gfx/D3D11/gfxD3D11Device.h index 05f4deda3..15d07913d 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Device.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Device.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 _GFXD3D11DEVICE_H_ #define _GFXD3D11DEVICE_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11EnumTranslate.h b/Engine/source/gfx/D3D11/gfxD3D11EnumTranslate.h index 7b553e6f7..8498345d5 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11EnumTranslate.h +++ b/Engine/source/gfx/D3D11/gfxD3D11EnumTranslate.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 _GFXD3D11ENUMTRANSLATE_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h b/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h index 71e7f0ac3..6f08055bb 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h +++ b/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.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 _GFX_D3D11_OCCLUSIONQUERY_H_ #define _GFX_D3D11_OCCLUSIONQUERY_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h b/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h index 3226c1fd1..2228db91d 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h +++ b/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.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 _GFXD3D11PRIMITIVEBUFFER_H_ #define _GFXD3D11PRIMITIVEBUFFER_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h b/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h index 30231c795..189063ebb 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h +++ b/Engine/source/gfx/D3D11/gfxD3D11QueryFence.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 _GFX_D3D11_QUERYFENCE_H_ #define _GFX_D3D11_QUERYFENCE_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11Shader.h b/Engine/source/gfx/D3D11/gfxD3D11Shader.h index 5e8b367fd..15fc21f10 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Shader.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Shader.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 _GFXD3D11SHADER_H_ #define _GFXD3D11SHADER_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h index 496bb8ec9..ea8ea29a7 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h +++ b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.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 _GFXD3D11STATEBLOCK_H_ #define _GFXD3D11STATEBLOCK_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11Target.h b/Engine/source/gfx/D3D11/gfxD3D11Target.h index 7d96ef34a..bb06cab44 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Target.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Target.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 _GFX_D3D_GFXD3D11TARGET_H_ #define _GFX_D3D_GFXD3D11TARGET_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h b/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h index 1626c39b7..c0b1404c6 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h +++ b/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h @@ -1,3 +1,5 @@ +#pragma once +#pragma once #ifndef _GFXD3D11TEXTUREARRAY_H_ #define _GFXD3D11TEXTUREARRAY_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h b/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h index f9d1a4f61..967ac09a4 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h +++ b/Engine/source/gfx/D3D11/gfxD3D11TextureManager.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 _GFXD3DTEXTUREMANAGER_H_ #define _GFXD3DTEXTUREMANAGER_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h b/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h index 6849beba6..6f4e18215 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h +++ b/Engine/source/gfx/D3D11/gfxD3D11TextureObject.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 _GFXD3D11TEXTUREOBJECT_H_ #define _GFXD3D11TEXTUREOBJECT_H_ diff --git a/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h b/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h index b677171d6..33a44ac76 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h +++ b/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.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 _GFXD3D_VERTEXBUFFER_H_ #define _GFXD3D_VERTEXBUFFER_H_ diff --git a/Engine/source/gfx/D3D11/screenshotD3D11.h b/Engine/source/gfx/D3D11/screenshotD3D11.h index 8822ae933..d2bc6b87d 100644 --- a/Engine/source/gfx/D3D11/screenshotD3D11.h +++ b/Engine/source/gfx/D3D11/screenshotD3D11.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 _SCREENSHOTD3D11_H_ #define _SCREENSHOTD3D11_H_ diff --git a/Engine/source/gfx/Null/gfxNullDevice.h b/Engine/source/gfx/Null/gfxNullDevice.h index 259fac5f2..683094320 100644 --- a/Engine/source/gfx/Null/gfxNullDevice.h +++ b/Engine/source/gfx/Null/gfxNullDevice.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 _GFXNullDevice_H_ #define _GFXNullDevice_H_ diff --git a/Engine/source/gfx/bitmap/bitmapUtils.h b/Engine/source/gfx/bitmap/bitmapUtils.h index 54607bfea..ccfe939b3 100644 --- a/Engine/source/gfx/bitmap/bitmapUtils.h +++ b/Engine/source/gfx/bitmap/bitmapUtils.h @@ -19,21 +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 _BITMAPUTILS_H_ #define _BITMAPUTILS_H_ -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _MMATHFN_H_ + #include "math/mMathFn.h" -#endif extern void (*bitmapExtrude5551)(const void *srcMip, void *mip, U32 height, U32 width); extern void (*bitmapExtrudeRGB)(const void *srcMip, void *mip, U32 height, U32 width, U32 bpp); diff --git a/Engine/source/gfx/bitmap/cubemapSaver.h b/Engine/source/gfx/bitmap/cubemapSaver.h index 8385eeba6..615622a0a 100644 --- a/Engine/source/gfx/bitmap/cubemapSaver.h +++ b/Engine/source/gfx/bitmap/cubemapSaver.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 #ifndef _CUBEMAP_SAVER_H_ #define _CUBEMAP_SAVER_H_ - -#ifndef _GFXCUBEMAP_H_ #include "gfx/gfxCubemap.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif diff --git a/Engine/source/gfx/bitmap/ddsData.h b/Engine/source/gfx/bitmap/ddsData.h index ac49e4392..a591ada01 100644 --- a/Engine/source/gfx/bitmap/ddsData.h +++ b/Engine/source/gfx/bitmap/ddsData.h @@ -24,13 +24,12 @@ // Portions Copyright (c) Microsoft Corporation. All rights reserved. // https://github.com/Microsoft/DirectXTex //////////////////////////////////////////////////////////////////////////////// +#pragma once +#pragma once #ifndef _DDSDATA_H_ #define _DDSDATA_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif #include "core/util/fourcc.h" diff --git a/Engine/source/gfx/bitmap/ddsFile.h b/Engine/source/gfx/bitmap/ddsFile.h index 5ad0a1baa..764ca628e 100644 --- a/Engine/source/gfx/bitmap/ddsFile.h +++ b/Engine/source/gfx/bitmap/ddsFile.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 _DDSFILE_H_ #define _DDSFILE_H_ - -#ifndef _GFXSTRUCTS_H_ #include "gfx/gfxStructs.h" -#endif -#ifndef _BITSET_H_ + #include "core/bitSet.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif diff --git a/Engine/source/gfx/bitmap/gBitmap.h b/Engine/source/gfx/bitmap/gBitmap.h index 8e99e47dd..0892ecea3 100644 --- a/Engine/source/gfx/bitmap/gBitmap.h +++ b/Engine/source/gfx/bitmap/gBitmap.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 _GBITMAP_H_ #define _GBITMAP_H_ @@ -26,22 +28,14 @@ #ifndef __RESOURCE_H__ #include "core/resource.h" #endif - -#ifndef _SWIZZLE_H_ #include "core/util/swizzle.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _GFXENUMS_H_ #include "gfx/gfxEnums.h" // For the format -#endif -#ifndef _PROFILER_H_ #include "platform/profiler.h" -#endif + //-------------------------------------- Forward decls. class Stream; class RectI; diff --git a/Engine/source/gfx/bitmap/imageUtils.h b/Engine/source/gfx/bitmap/imageUtils.h index 1fb36656c..a9336ed35 100644 --- a/Engine/source/gfx/bitmap/imageUtils.h +++ b/Engine/source/gfx/bitmap/imageUtils.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 _IMAGE_UTILS_H_ #define _IMAGE_UTILS_H_ - -#ifndef _SWIZZLE_H_ #include "core/util/swizzle.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _MMATHFN_H_ + #include "math/mMathFn.h" -#endif struct DDSFile; diff --git a/Engine/source/gfx/bitmap/loaders/ies/ies_loader.h b/Engine/source/gfx/bitmap/loaders/ies/ies_loader.h index 01c0e6a37..75c4ffdc4 100644 --- a/Engine/source/gfx/bitmap/loaders/ies/ies_loader.h +++ b/Engine/source/gfx/bitmap/loaders/ies/ies_loader.h @@ -34,6 +34,7 @@ // | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +---------------------------------------------------------------------- +#pragma once #ifndef _H_IES_LOADER_H_ #define _H_IES_LOADER_H_ diff --git a/Engine/source/gfx/bitmap/pngUtils.h b/Engine/source/gfx/bitmap/pngUtils.h index 787f5272b..cd1b1dd58 100644 --- a/Engine/source/gfx/bitmap/pngUtils.h +++ b/Engine/source/gfx/bitmap/pngUtils.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 _PNG_UTILS_H_ #define _PNG_UTILS_H_ - -#ifndef _GFXENUMS_H_ #include "gfx/gfxEnums.h" -#endif struct DeferredPNGWriterData; // This is used to avoid including png.h in this header class GBitmap; diff --git a/Engine/source/gfx/gFont.h b/Engine/source/gfx/gFont.h index 2f5274af2..19af34285 100644 --- a/Engine/source/gfx/gFont.h +++ b/Engine/source/gfx/gFont.h @@ -19,27 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFONT_H_ #define _GFONT_H_ //Includes -#ifndef _RESOURCE_H_ #include "core/resource.h" -#endif -#ifndef _PLATFORMFONT_H_ -#include "platform/platformFont.h" -#endif -#ifndef _GBITMAP_H_ -#include "gfx/bitmap/gBitmap.h" -#endif -#ifndef _GFXDEVICE_H_ -#include "gfx/gfxDevice.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ -#include "gfx/gfxTextureHandle.h" -#endif +#include "platform/platformFont.h" + +#include "gfx/bitmap/gBitmap.h" + +#include "gfx/gfxDevice.h" + +#include "gfx/gfxTextureHandle.h" GFX_DeclareTextureProfile(GFXFontTextureProfile); #define Font_Table_MAX 65536 diff --git a/Engine/source/gfx/gfxAPI.h b/Engine/source/gfx/gfxAPI.h index 00f219166..f22ef41a1 100644 --- a/Engine/source/gfx/gfxAPI.h +++ b/Engine/source/gfx/gfxAPI.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 _GFXAPI_H_ #define _GFXAPI_H_ diff --git a/Engine/source/gfx/gfxAdapter.h b/Engine/source/gfx/gfxAdapter.h index 80435618c..df022c650 100644 --- a/Engine/source/gfx/gfxAdapter.h +++ b/Engine/source/gfx/gfxAdapter.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFXADAPTER_H_ #define _GFXADAPTER_H_ - -#ifndef _GFXSTRUCTS_H_ #include "gfx/gfxStructs.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif struct GFXAdapterLUID { diff --git a/Engine/source/gfx/gfxCardProfile.h b/Engine/source/gfx/gfxCardProfile.h index 183b27532..2437f4532 100644 --- a/Engine/source/gfx/gfxCardProfile.h +++ b/Engine/source/gfx/gfxCardProfile.h @@ -19,20 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFXCARDPROFILE_H_ #define _GFXCARDPROFILE_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _GFXDEVICE_H_ -#include "gfx/gfxDevice.h" -#endif -#ifndef _TORQUE_STRING_H_ -#include "core/util/str.h" -#endif +#include "gfx/gfxDevice.h" +#include "core/util/str.h" /// GFXCardProfiler provides a device independent wrapper around both the /// capabilities reported by the card/drivers and the exceptions recorded diff --git a/Engine/source/gfx/gfxCubemap.h b/Engine/source/gfx/gfxCubemap.h index 2db9920a3..0ac2d9797 100644 --- a/Engine/source/gfx/gfxCubemap.h +++ b/Engine/source/gfx/gfxCubemap.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 _GFXCUBEMAP_H_ #define _GFXCUBEMAP_H_ - -#ifndef _GFXTEXTUREHANDLE_H_ #include "gfx/gfxTextureHandle.h" -#endif class GFXDevice; struct DDSFile; diff --git a/Engine/source/gfx/gfxDebugEvent.h b/Engine/source/gfx/gfxDebugEvent.h index a6763f800..3a234cba6 100644 --- a/Engine/source/gfx/gfxDebugEvent.h +++ b/Engine/source/gfx/gfxDebugEvent.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 _GFXDEBUGEVENT_H_ #define _GFXDEBUGEVENT_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif /// See TorqueConfig.h to enable this. #ifdef TORQUE_ENABLE_GFXDEBUGEVENTS diff --git a/Engine/source/gfx/gfxDevice.h b/Engine/source/gfx/gfxDevice.h index 98c0184f4..a8cb50db5 100644 --- a/Engine/source/gfx/gfxDevice.h +++ b/Engine/source/gfx/gfxDevice.h @@ -20,43 +20,31 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- #pragma once +#pragma once +#pragma once #ifndef _GFXDEVICE_H_ #define _GFXDEVICE_H_ - -#ifndef _GFXADAPTER_H_ #include "gfx/gfxAdapter.h" -#endif -#ifndef _GFXTARGET_H_ -#include "gfx/gfxTarget.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ -#include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ -#include "gfx/gfxStateBlock.h" -#endif -#ifndef _GFXSHADER_H_ -#include "gfx/gfxShader.h" -#endif -#ifndef _GFXCUBEMAP_H_ -#include "gfx/gfxCubemap.h" -#endif -#ifndef _TDICTIONARY_H_ -#include "core/util/tDictionary.h" -#endif -#ifndef _TSIGNAL_H_ -#include "core/util/tSignal.h" -#endif -#ifndef _GFXDEVICESTATISTICS_H_ -#include "gfx/gfxDeviceStatistics.h" -#endif -#ifndef _MATHUTIL_FRUSTUM_H_ -#include "math/util/frustum.h" -#endif -#ifndef _PLATFORM_PLATFORMTIMER_H_ +#include "gfx/gfxTarget.h" + +#include "gfx/gfxVertexBuffer.h" + +#include "gfx/gfxStateBlock.h" + +#include "gfx/gfxShader.h" + +#include "gfx/gfxCubemap.h" + +#include "core/util/tDictionary.h" + +#include "core/util/tSignal.h" + +#include "gfx/gfxDeviceStatistics.h" +#include "math/util/frustum.h" + #include "platform/platformTimer.h" -#endif + #include "gfxTextureArray.h" class FontRenderBatcher; diff --git a/Engine/source/gfx/gfxDeviceStatistics.h b/Engine/source/gfx/gfxDeviceStatistics.h index ab82f95ec..d24229daf 100644 --- a/Engine/source/gfx/gfxDeviceStatistics.h +++ b/Engine/source/gfx/gfxDeviceStatistics.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 _GFXDEVICESTATISTICS_H_ #define _GFXDEVICESTATISTICS_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif // A class that hold a simple set of device stats. class GFXDeviceStatistics diff --git a/Engine/source/gfx/gfxDrawUtil.h b/Engine/source/gfx/gfxDrawUtil.h index 583feb407..630a660fd 100644 --- a/Engine/source/gfx/gfxDrawUtil.h +++ b/Engine/source/gfx/gfxDrawUtil.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GFX_GFXDRAWER_H_ #define _GFX_GFXDRAWER_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif class FontRenderBatcher; class Frustum; diff --git a/Engine/source/gfx/gfxEnums.h b/Engine/source/gfx/gfxEnums.h index cc670f6a6..7de215f19 100644 --- a/Engine/source/gfx/gfxEnums.h +++ b/Engine/source/gfx/gfxEnums.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 _GFXENUMS_H_ #define _GFXENUMS_H_ diff --git a/Engine/source/gfx/gfxFence.h b/Engine/source/gfx/gfxFence.h index 5855ab076..ecdb0af8e 100644 --- a/Engine/source/gfx/gfxFence.h +++ b/Engine/source/gfx/gfxFence.h @@ -19,14 +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 _GFXFENCE_H_ #define _GFXFENCE_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif - /// class GFXFence : public GFXResource diff --git a/Engine/source/gfx/gfxFontRenderBatcher.h b/Engine/source/gfx/gfxFontRenderBatcher.h index 25f707db4..27db38a71 100644 --- a/Engine/source/gfx/gfxFontRenderBatcher.h +++ b/Engine/source/gfx/gfxFontRenderBatcher.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 _GFXFONTBATCHER_H_ #define _GFXFONTBATCHER_H_ diff --git a/Engine/source/gfx/gfxFormatUtils.h b/Engine/source/gfx/gfxFormatUtils.h index 4d5729f00..f000b8c15 100644 --- a/Engine/source/gfx/gfxFormatUtils.h +++ b/Engine/source/gfx/gfxFormatUtils.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 _GFXFORMATUTILS_H_ #define _GFXFORMATUTILS_H_ diff --git a/Engine/source/gfx/gfxInit.h b/Engine/source/gfx/gfxInit.h index 4152d9ce9..1da9418f4 100644 --- a/Engine/source/gfx/gfxInit.h +++ b/Engine/source/gfx/gfxInit.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 _GFXINIT_H_ #define _GFXINIT_H_ diff --git a/Engine/source/gfx/gfxOcclusionQuery.h b/Engine/source/gfx/gfxOcclusionQuery.h index 0b36b410c..0bc1cdaea 100644 --- a/Engine/source/gfx/gfxOcclusionQuery.h +++ b/Engine/source/gfx/gfxOcclusionQuery.h @@ -19,14 +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 _GFXOCCLUSIONQUERY_H_ #define _GFXOCCLUSIONQUERY_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif - /// A geometry visibility query object. /// @see GFXDevice::createOcclusionQuery diff --git a/Engine/source/gfx/gfxPrimitiveBuffer.h b/Engine/source/gfx/gfxPrimitiveBuffer.h index bebe6dd32..332e4649f 100644 --- a/Engine/source/gfx/gfxPrimitiveBuffer.h +++ b/Engine/source/gfx/gfxPrimitiveBuffer.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 _GFXPRIMITIVEBUFFER_H_ #define _GFXPRIMITIVEBUFFER_H_ - -#ifndef _GFXSTRUCTS_H_ #include "gfx/gfxStructs.h" -#endif #ifdef TORQUE_ENABLE_PROFILER #include "platform/profiler.h" diff --git a/Engine/source/gfx/gfxResource.h b/Engine/source/gfx/gfxResource.h index 43420dbe2..0d6f4af96 100644 --- a/Engine/source/gfx/gfxResource.h +++ b/Engine/source/gfx/gfxResource.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 _GFXRESOURCE_H_ #define _GFXRESOURCE_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif class GFXDevice; diff --git a/Engine/source/gfx/gfxShader.h b/Engine/source/gfx/gfxShader.h index 720d76290..25c0f383f 100644 --- a/Engine/source/gfx/gfxShader.h +++ b/Engine/source/gfx/gfxShader.h @@ -19,43 +19,31 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFXSHADER_H_ #define _GFXSHADER_H_ - -#ifndef _GFXRESOURCE_H_ #include "gfx/gfxResource.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _ALIGNEDARRAY_H_ + #include "core/util/tAlignedArray.h" -#endif -#ifndef _MMATRIX_H_ + #include "math/mMatrix.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _GFXSTRUCTS_H_ + #include "gfx/gfxStructs.h" -#endif -#ifndef _COLOR_H_ + #include "core/color.h" -#endif -#ifndef _REFBASE_H_ + #include "core/util/refBase.h" -#endif -#ifndef _PATH_H_ + #include "core/util/path.h" -#endif -#ifndef _TSIGNAL_H_ + #include "core/util/tSignal.h" -#endif class Point2I; class Point2F; diff --git a/Engine/source/gfx/gfxStateBlock.h b/Engine/source/gfx/gfxStateBlock.h index 21bfbaf1c..9bd957c1f 100644 --- a/Engine/source/gfx/gfxStateBlock.h +++ b/Engine/source/gfx/gfxStateBlock.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 _GFXSTATEBLOCK_H_ #define _GFXSTATEBLOCK_H_ - -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _GFXRESOURCE_H_ + #include "gfx/gfxResource.h" -#endif -#ifndef _COLOR_H_ + #include "core/color.h" -#endif #pragma pack(push, 1) struct GFXSamplerStateDesc diff --git a/Engine/source/gfx/gfxStringEnumTranslate.h b/Engine/source/gfx/gfxStringEnumTranslate.h index 4675b9c0f..4ebffd8f7 100644 --- a/Engine/source/gfx/gfxStringEnumTranslate.h +++ b/Engine/source/gfx/gfxStringEnumTranslate.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 _GFXSTRINGENUMTRANSLATE_H_ #define _GFXSTRINGENUMTRANSLATE_H_ diff --git a/Engine/source/gfx/gfxStructs.h b/Engine/source/gfx/gfxStructs.h index 56ff5411d..2aeea319e 100644 --- a/Engine/source/gfx/gfxStructs.h +++ b/Engine/source/gfx/gfxStructs.h @@ -19,34 +19,26 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFXSTRUCTS_H_ #define _GFXSTRUCTS_H_ - -#ifndef _COLOR_H_ #include "core/color.h" -#endif -#ifndef _GFXVERTEXCOLOR_H_ + #include "gfx/gfxVertexColor.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif -#ifndef _PROFILER_H_ + #include "platform/profiler.h" -#endif -#ifndef _GFXRESOURCE_H_ + #include "gfx/gfxResource.h" -#endif -#ifndef _REFBASE_H_ + #include "core/util/refBase.h" -#endif -#ifndef _GFXVERTEXTYPES_H_ + #include "gfx/gfxVertexTypes.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/gfx/gfxTarget.h b/Engine/source/gfx/gfxTarget.h index 27975ed53..ceefb5663 100644 --- a/Engine/source/gfx/gfxTarget.h +++ b/Engine/source/gfx/gfxTarget.h @@ -19,23 +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 _GFXTARGET_H_ #define _GFXTARGET_H_ - -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _GFXENUMS_H_ -#include "gfx/gfxEnums.h" -#endif -#ifndef _GFXRESOURCE_H_ -#include "gfx/gfxResource.h" -#endif -#ifndef _MPOINT3_H_ -#include "math/mPoint3.h" -#endif +#include "gfx/gfxEnums.h" + +#include "gfx/gfxResource.h" + +#include "math/mPoint3.h" class Point2I; class PlatformWindow; diff --git a/Engine/source/gfx/gfxTextureArray.h b/Engine/source/gfx/gfxTextureArray.h index 14fccf49b..e07525102 100644 --- a/Engine/source/gfx/gfxTextureArray.h +++ b/Engine/source/gfx/gfxTextureArray.h @@ -19,22 +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 _GFXTEXTUREARRAY_H_ #define _GFXTEXTUREARRAY_H_ - -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _GFXRESOURCE_H_ + #include "gfx/gfxResource.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfxEnums.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfxTextureHandle.h" -#endif + #include "core/util/tVector.h" diff --git a/Engine/source/gfx/gfxTextureHandle.h b/Engine/source/gfx/gfxTextureHandle.h index 61940d899..26b96e512 100644 --- a/Engine/source/gfx/gfxTextureHandle.h +++ b/Engine/source/gfx/gfxTextureHandle.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 _GFXTEXTUREHANDLE_H_ #define _GFXTEXTUREHANDLE_H_ - -#ifndef _GFXTEXTUREOBJECT_H_ #include "gfx/gfxTextureObject.h" -#endif -#ifndef _MPOINT2_H_ -#include "math/mPoint2.h" -#endif +#include "math/mPoint2.h" class GFXTextureProfile; diff --git a/Engine/source/gfx/gfxTextureManager.h b/Engine/source/gfx/gfxTextureManager.h index 09c90335a..e7dee4b35 100644 --- a/Engine/source/gfx/gfxTextureManager.h +++ b/Engine/source/gfx/gfxTextureManager.h @@ -19,28 +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 _GFXTEXTUREMANAGER_H_ #define _GFXTEXTUREMANAGER_H_ - -#ifndef _GFXTEXTUREOBJECT_H_ #include "gfx/gfxTextureObject.h" -#endif -#ifndef _GBITMAP_H_ + #include "gfx/bitmap/gBitmap.h" -#endif -#ifndef _DDSFILE_H_ + #include "gfx/bitmap/ddsFile.h" -#endif -#ifndef _RESOURCEMANAGER_H_ + #include "core/resourceManager.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif -#ifndef _TSIGNAL_H_ + #include "core/util/tSignal.h" -#endif + #include "gfxTextureHandle.h" diff --git a/Engine/source/gfx/gfxTextureObject.h b/Engine/source/gfx/gfxTextureObject.h index e0cd6a46a..1dd53791d 100644 --- a/Engine/source/gfx/gfxTextureObject.h +++ b/Engine/source/gfx/gfxTextureObject.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 _GFXTEXTUREOBJECT_H_ #define _GFXTEXTUREOBJECT_H_ - -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _GFXTEXTUREPROFILE_H_ + #include "gfx/gfxTextureProfile.h" -#endif -#ifndef _GFXRESOURCE_H_ + #include "gfx/gfxResource.h" -#endif class Point2I; class GFXDevice; diff --git a/Engine/source/gfx/gfxTextureProfile.h b/Engine/source/gfx/gfxTextureProfile.h index 2c1170b73..1034e2698 100644 --- a/Engine/source/gfx/gfxTextureProfile.h +++ b/Engine/source/gfx/gfxTextureProfile.h @@ -20,13 +20,12 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- #pragma once +#pragma once +#pragma once #ifndef _GFXTEXTUREPROFILE_H_ #define _GFXTEXTUREPROFILE_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif class GFXTextureObject; diff --git a/Engine/source/gfx/gfxTransformSaver.h b/Engine/source/gfx/gfxTransformSaver.h index 85374f1dd..218ff3b33 100644 --- a/Engine/source/gfx/gfxTransformSaver.h +++ b/Engine/source/gfx/gfxTransformSaver.h @@ -19,14 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GFX_GFXTRANSFORMSAVER_H_ #define _GFX_GFXTRANSFORMSAVER_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif - /// Helper class to store viewport and matrix stack state, and restore it /// later. diff --git a/Engine/source/gfx/gfxVertexBuffer.h b/Engine/source/gfx/gfxVertexBuffer.h index 68ccc8b52..8fa0558b9 100644 --- a/Engine/source/gfx/gfxVertexBuffer.h +++ b/Engine/source/gfx/gfxVertexBuffer.h @@ -19,14 +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 _GFXVERTEXBUFFER_H_ #define _GFXVERTEXBUFFER_H_ - -#ifndef _GFXSTRUCTS_H_ #include "gfx/gfxStructs.h" -#endif - //***************************************************************************** // GFXVertexBuffer - base vertex buffer class diff --git a/Engine/source/gfx/gfxVertexColor.h b/Engine/source/gfx/gfxVertexColor.h index cea1f7a03..98b8e32fc 100644 --- a/Engine/source/gfx/gfxVertexColor.h +++ b/Engine/source/gfx/gfxVertexColor.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFXVERTEXCOLOR_H_ #define _GFXVERTEXCOLOR_H_ - -#ifndef _SWIZZLE_H_ #include "core/util/swizzle.h" -#endif + #include "core/color.h" class GFXVertexColor diff --git a/Engine/source/gfx/gfxVertexFormat.h b/Engine/source/gfx/gfxVertexFormat.h index 24807a21b..089396592 100644 --- a/Engine/source/gfx/gfxVertexFormat.h +++ b/Engine/source/gfx/gfxVertexFormat.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 _GFXVERTEXFORMAT_H_ #define _GFXVERTEXFORMAT_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _GFXENUMS_H_ -#include "gfx/gfxEnums.h" -#endif +#include "gfx/gfxEnums.h" /// The known Torque vertex element semantics. You can use /// other semantic strings, but they will be interpreted as diff --git a/Engine/source/gfx/gfxVertexTypes.h b/Engine/source/gfx/gfxVertexTypes.h index 2a9a152cb..57548121d 100644 --- a/Engine/source/gfx/gfxVertexTypes.h +++ b/Engine/source/gfx/gfxVertexTypes.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 _GFXVERTEXTYPES_H_ #define _GFXVERTEXTYPES_H_ - -#ifndef _GFXVERTEXFORMAT_H_ #include "gfx/gfxVertexFormat.h" -#endif -#ifndef _GFXVERTEXCOLOR_H_ + #include "gfx/gfxVertexColor.h" -#endif -#ifndef _MPOINT2_H_ + #include "math/mPoint2.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif GFXDeclareVertexFormat( GFXVertexP ) { diff --git a/Engine/source/gfx/gl/gfxGLAppleFence.h b/Engine/source/gfx/gl/gfxGLAppleFence.h index 8d36ff1e1..7332010ca 100644 --- a/Engine/source/gfx/gl/gfxGLAppleFence.h +++ b/Engine/source/gfx/gl/gfxGLAppleFence.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 _GFXGLAPPLEFENCE_H_ #define _GFXGLAPPLEFENCE_H_ diff --git a/Engine/source/gfx/gl/gfxGLCubemap.h b/Engine/source/gfx/gl/gfxGLCubemap.h index 3ab23d094..54d15cb51 100644 --- a/Engine/source/gfx/gl/gfxGLCubemap.h +++ b/Engine/source/gfx/gl/gfxGLCubemap.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFXGLCUBEMAP_H_ #define _GFXGLCUBEMAP_H_ - -#ifndef _GFXCUBEMAP_H_ #include "gfx/gfxCubemap.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif diff --git a/Engine/source/gfx/gl/gfxGLDevice.h b/Engine/source/gfx/gl/gfxGLDevice.h index 52f0a39e6..d3ff66acf 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.h +++ b/Engine/source/gfx/gl/gfxGLDevice.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 _GFXGLDEVICE_H_ #define _GFXGLDEVICE_H_ diff --git a/Engine/source/gfx/gl/gfxGLEnumTranslate.h b/Engine/source/gfx/gl/gfxGLEnumTranslate.h index 1f3ddb3aa..60ca634f7 100644 --- a/Engine/source/gfx/gl/gfxGLEnumTranslate.h +++ b/Engine/source/gfx/gl/gfxGLEnumTranslate.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 _GFXGLENUMTRANSLATE_H_ #define _GFXGLENUMTRANSLATE_H_ diff --git a/Engine/source/gfx/gl/gfxGLOcclusionQuery.h b/Engine/source/gfx/gl/gfxGLOcclusionQuery.h index b603bdfa5..a1c2637e6 100644 --- a/Engine/source/gfx/gl/gfxGLOcclusionQuery.h +++ b/Engine/source/gfx/gl/gfxGLOcclusionQuery.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 _GFX_GL_OCCLUSIONQUERY_H_ #define _GFX_GL_OCCLUSIONQUERY_H_ - -#ifndef _GFXOCCLUSIONQUERY_H_ #include "gfx/gfxOcclusionQuery.h" -#endif class GFXGLOcclusionQuery : public GFXOcclusionQuery { diff --git a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h index 3fc0a30e0..28ec72f73 100644 --- a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h +++ b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.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 _GFXGLPRIMITIVEBUFFER_H_ #define _GFXGLPRIMITIVEBUFFER_H_ diff --git a/Engine/source/gfx/gl/gfxGLShader.h b/Engine/source/gfx/gl/gfxGLShader.h index 45896e89e..b347c13ff 100644 --- a/Engine/source/gfx/gl/gfxGLShader.h +++ b/Engine/source/gfx/gl/gfxGLShader.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 _GFXGLSHADER_H_ #define _GFXGLSHADER_H_ diff --git a/Engine/source/gfx/gl/gfxGLStateBlock.h b/Engine/source/gfx/gl/gfxGLStateBlock.h index be19c583d..32216418d 100644 --- a/Engine/source/gfx/gl/gfxGLStateBlock.h +++ b/Engine/source/gfx/gl/gfxGLStateBlock.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 _GFXGLSTATEBLOCK_H_ #define _GFXGLSTATEBLOCK_H_ diff --git a/Engine/source/gfx/gl/gfxGLTextureArray.h b/Engine/source/gfx/gl/gfxGLTextureArray.h index 7073b1653..2cb270a6f 100644 --- a/Engine/source/gfx/gl/gfxGLTextureArray.h +++ b/Engine/source/gfx/gl/gfxGLTextureArray.h @@ -1,3 +1,5 @@ +#pragma once +#pragma once #ifndef _GFXGLTEXTUREARRAY_H_ #define _GFXGLTEXTUREARRAY_H_ diff --git a/Engine/source/gfx/gl/gfxGLTextureObject.h b/Engine/source/gfx/gl/gfxGLTextureObject.h index b62f6da40..e1850c9a6 100644 --- a/Engine/source/gfx/gl/gfxGLTextureObject.h +++ b/Engine/source/gfx/gl/gfxGLTextureObject.h @@ -26,9 +26,8 @@ #include "gfx/gfxTextureObject.h" #include "gfx/gl/tGL/tGL.h" #include "gfx/gfxStateBlock.h" -#ifndef _MRECT_H_ #include "math/mRect.h" -#endif + class GFXGLDevice; class GFXGLTextureObject : public GFXTextureObject diff --git a/Engine/source/gfx/gl/gfxGLTextureTarget.h b/Engine/source/gfx/gl/gfxGLTextureTarget.h index 7a327d900..fb2feef67 100644 --- a/Engine/source/gfx/gl/gfxGLTextureTarget.h +++ b/Engine/source/gfx/gl/gfxGLTextureTarget.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 _GFXGLTEXTURETARGET_H_ #define _GFXGLTEXTURETARGET_H_ diff --git a/Engine/source/gfx/gl/gfxGLVertexBuffer.h b/Engine/source/gfx/gl/gfxGLVertexBuffer.h index a995da1a2..567aae76b 100644 --- a/Engine/source/gfx/gl/gfxGLVertexBuffer.h +++ b/Engine/source/gfx/gl/gfxGLVertexBuffer.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GFXGLVERTEXBUFFER_H_ #define _GFXGLVERTEXBUFFER_H_ - -#ifndef _GFXVERTEXBUFFER_H_ #include "gfx/gfxVertexBuffer.h" -#endif + #include "gfx/gl/tGL/tGL.h" #include "gfx/gl/util/glFrameAllocatorLockableHelper.h" diff --git a/Engine/source/gfx/gl/gfxGLWindowTarget.h b/Engine/source/gfx/gl/gfxGLWindowTarget.h index 297357bd8..adc201c05 100644 --- a/Engine/source/gfx/gl/gfxGLWindowTarget.h +++ b/Engine/source/gfx/gl/gfxGLWindowTarget.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 _GFXGLWINDOWTARGET_H_ #define _GFXGLWINDOWTARGET_H_ diff --git a/Engine/source/gfx/gl/screenshotGL.h b/Engine/source/gfx/gl/screenshotGL.h index 9fce67b90..f5bbc8f81 100644 --- a/Engine/source/gfx/gl/screenshotGL.h +++ b/Engine/source/gfx/gl/screenshotGL.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 _SCREENSHOTGL_H_ #define _SCREENSHOTGL_H_ diff --git a/Engine/source/gfx/primBuilder.h b/Engine/source/gfx/primBuilder.h index 6132a417e..21aebcb5d 100644 --- a/Engine/source/gfx/primBuilder.h +++ b/Engine/source/gfx/primBuilder.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 _PRIMBUILDER_H_ #define _PRIMBUILDER_H_ diff --git a/Engine/source/gfx/screenshot.h b/Engine/source/gfx/screenshot.h index f8b059fae..388eb8197 100644 --- a/Engine/source/gfx/screenshot.h +++ b/Engine/source/gfx/screenshot.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 _SCREENSHOT_H_ #define _SCREENSHOT_H_ diff --git a/Engine/source/gfx/sim/cubemapData.h b/Engine/source/gfx/sim/cubemapData.h index 54facf7a4..aa681bfba 100644 --- a/Engine/source/gfx/sim/cubemapData.h +++ b/Engine/source/gfx/sim/cubemapData.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 _CUBEMAPDATA_H_ #define _CUBEMAPDATA_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _GFXCUBEMAP_H_ #include "gfx/gfxCubemap.h" -#endif -#ifndef _GFXTARGET_H_ #include "gfx/gfxTarget.h" -#endif -#ifndef _SCENEMANAGER_H_ #include "scene/sceneManager.h" -#endif #include "T3D/assets/ImageAsset.h" diff --git a/Engine/source/gfx/sim/debugDraw.h b/Engine/source/gfx/sim/debugDraw.h index d3c75cf69..9859d058a 100644 --- a/Engine/source/gfx/sim/debugDraw.h +++ b/Engine/source/gfx/sim/debugDraw.h @@ -19,34 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _DEBUGDRAW_H_ #define _DEBUGDRAW_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _PRIMBUILDER_H_ #include "gfx/primBuilder.h" -#endif -#ifndef _GFONT_H_ #include "gfx/gFont.h" -#endif -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif - class GFont; diff --git a/Engine/source/gfx/sim/gfxStateBlockData.h b/Engine/source/gfx/sim/gfxStateBlockData.h index 061301a00..90b46a5ab 100644 --- a/Engine/source/gfx/sim/gfxStateBlockData.h +++ b/Engine/source/gfx/sim/gfxStateBlockData.h @@ -19,16 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef __GFXSTATEBLOCKDATA_H_ #define __GFXSTATEBLOCKDATA_H_ - -#ifndef _GFXSTATEBLOCK_H_ #include "gfx/gfxStateBlock.h" -#endif -#ifndef _SIMOBJECT_H_ -#include "console/simObject.h" -#endif +#include "console/simObject.h" class GFXSamplerStateData; diff --git a/Engine/source/gfx/util/distanceField.h b/Engine/source/gfx/util/distanceField.h index e695d4d1a..72525ba56 100644 --- a/Engine/source/gfx/util/distanceField.h +++ b/Engine/source/gfx/util/distanceField.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 _DISTANCE_FIELD_H_ #define _DISTANCE_FIELD_H_ diff --git a/Engine/source/gfx/util/gfxFrustumSaver.h b/Engine/source/gfx/util/gfxFrustumSaver.h index c45cda5ab..e24e70377 100644 --- a/Engine/source/gfx/util/gfxFrustumSaver.h +++ b/Engine/source/gfx/util/gfxFrustumSaver.h @@ -24,10 +24,7 @@ #define TORQUE_GFX_UTIL_GFXFRUSTUMSAVER_H_ #include "platform/types.h" - -#ifndef _MATHUTIL_FRUSTUM_H_ #include "math/util/frustum.h" -#endif class GFXFrustumSaver { diff --git a/Engine/source/gfx/util/screenspace.h b/Engine/source/gfx/util/screenspace.h index 4274ae944..536898e9c 100644 --- a/Engine/source/gfx/util/screenspace.h +++ b/Engine/source/gfx/util/screenspace.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 _SCREENSPACE_UTILS_H_ #define _SCREENSPACE_UTILS_H_ diff --git a/Engine/source/gfx/util/triListOpt.h b/Engine/source/gfx/util/triListOpt.h index db454f010..54ec7f991 100644 --- a/Engine/source/gfx/util/triListOpt.h +++ b/Engine/source/gfx/util/triListOpt.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 _TRI_LIST_OPT_H_ #define _TRI_LIST_OPT_H_ diff --git a/Engine/source/gfx/video/theoraTexture.h b/Engine/source/gfx/video/theoraTexture.h index d262dfae7..e77d523e2 100644 --- a/Engine/source/gfx/video/theoraTexture.h +++ b/Engine/source/gfx/video/theoraTexture.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 _THEORATEXTURE_H_ #define _THEORATEXTURE_H_ diff --git a/Engine/source/gfx/video/theoraTextureObject.h b/Engine/source/gfx/video/theoraTextureObject.h index 48cbe5fd1..e1831ef43 100644 --- a/Engine/source/gfx/video/theoraTextureObject.h +++ b/Engine/source/gfx/video/theoraTextureObject.h @@ -19,24 +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 _THEORATEXTUREOBJECT_H_ #define _THEORATEXTUREOBJECT_H_ #ifdef TORQUE_OGGTHEORA - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _THEORATEXTURE_H_ #include "gfx/video/theoraTexture.h" -#endif -#ifndef _MATTEXTURETARGET_H_ #include "materials/matTextureTarget.h" -#endif - class SFXDescription; diff --git a/Engine/source/gfx/video/videoCapture.h b/Engine/source/gfx/video/videoCapture.h index ca3598067..7933b7562 100644 --- a/Engine/source/gfx/video/videoCapture.h +++ b/Engine/source/gfx/video/videoCapture.h @@ -19,34 +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 _VIDEOCAPTURE_H_ #define _VIDEOCAPTURE_H_ - -#ifndef _TSINGLETON_H_ #include "core/util/tSingleton.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _MPOINT2_H_ #include "math/mPoint2.h" -#endif -#ifndef _THREADSAFEDEQUE_H_ #include "platform/threads/threadSafeDeque.h" -#endif - class GuiCanvas; class VideoFrameGrabber; diff --git a/Engine/source/gui/3d/guiTSControl.h b/Engine/source/gui/3d/guiTSControl.h index a596952d7..1f2467a5d 100644 --- a/Engine/source/gui/3d/guiTSControl.h +++ b/Engine/source/gui/3d/guiTSControl.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 _GUITSCONTROL_H_ #define _GUITSCONTROL_H_ - -#ifndef _GUICONTAINER_H_ #include "gui/containers/guiContainer.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif - -#ifndef _MATTEXTURETARGET_H_ #include "materials/matTextureTarget.h" -#endif -#ifndef _GUIOFFSCREENCANVAS_H_ #include "gui/core/guiOffscreenCanvas.h" -#endif class IDisplayDevice; class GuiOffscreenCanvas; diff --git a/Engine/source/gui/buttons/guiBitmapButtonCtrl.h b/Engine/source/gui/buttons/guiBitmapButtonCtrl.h index 5a5f56ee0..50ad9b7a4 100644 --- a/Engine/source/gui/buttons/guiBitmapButtonCtrl.h +++ b/Engine/source/gui/buttons/guiBitmapButtonCtrl.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 _GUIBITMAPBUTTON_H_ #define _GUIBITMAPBUTTON_H_ diff --git a/Engine/source/gui/buttons/guiButtonBaseCtrl.h b/Engine/source/gui/buttons/guiButtonBaseCtrl.h index 8ef4331ba..fe76349e8 100644 --- a/Engine/source/gui/buttons/guiButtonBaseCtrl.h +++ b/Engine/source/gui/buttons/guiButtonBaseCtrl.h @@ -19,14 +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 _GUIBUTTONBASECTRL_H_ #define _GUIBUTTONBASECTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif - /// Base class for all button controls. Subclasses are mostly for specific /// rendering types. diff --git a/Engine/source/gui/buttons/guiButtonCtrl.h b/Engine/source/gui/buttons/guiButtonCtrl.h index e966f60b2..554b4b3ea 100644 --- a/Engine/source/gui/buttons/guiButtonCtrl.h +++ b/Engine/source/gui/buttons/guiButtonCtrl.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 _GUIBUTTONCTRL_H_ #define _GUIBUTTONCTRL_H_ - -#ifndef _GUIBUTTONBASECTRL_H_ #include "gui/buttons/guiButtonBaseCtrl.h" -#endif class GuiButtonCtrl : public GuiButtonBaseCtrl { diff --git a/Engine/source/gui/buttons/guiCheckBoxCtrl.h b/Engine/source/gui/buttons/guiCheckBoxCtrl.h index 190fafdbe..f9abfbb03 100644 --- a/Engine/source/gui/buttons/guiCheckBoxCtrl.h +++ b/Engine/source/gui/buttons/guiCheckBoxCtrl.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 _GUICHECKBOXCTRL_H_ #define _GUICHECKBOXCTRL_H_ diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.h b/Engine/source/gui/buttons/guiIconButtonCtrl.h index 786997bb1..21e5b5327 100644 --- a/Engine/source/gui/buttons/guiIconButtonCtrl.h +++ b/Engine/source/gui/buttons/guiIconButtonCtrl.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GUIICONBUTTON_H_ #define _GUIICONBUTTON_H_ - -#ifndef _GUIBUTTONCTRL_H_ #include "gui/buttons/guiButtonCtrl.h" -#endif + #ifndef GFX_Texture_Manager_H_ #include "gfx/gfxTextureManager.h" #endif diff --git a/Engine/source/gui/buttons/guiRadioCtrl.h b/Engine/source/gui/buttons/guiRadioCtrl.h index 5bcaf3247..3ffbc4afd 100644 --- a/Engine/source/gui/buttons/guiRadioCtrl.h +++ b/Engine/source/gui/buttons/guiRadioCtrl.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 _GUIRADIOCTRL_H_ #define _GUIRADIOCTRL_H_ - -#ifndef _GUICHECKBOXCTRLL_H_ #include "gui/buttons/guiCheckBoxCtrl.h" -#endif // the radio button renders exactly the same as the check box // the only difference is it sends messages to its siblings to diff --git a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h b/Engine/source/gui/buttons/guiSwatchButtonCtrl.h index e457eb4f2..703f72c53 100644 --- a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h +++ b/Engine/source/gui/buttons/guiSwatchButtonCtrl.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 _GUISWATCHBUTTONCTRL_H_ #define _GUISWATCHBUTTONCTRL_H_ diff --git a/Engine/source/gui/buttons/guiToggleButtonCtrl.h b/Engine/source/gui/buttons/guiToggleButtonCtrl.h index e8ae9f860..116fd8aa3 100644 --- a/Engine/source/gui/buttons/guiToggleButtonCtrl.h +++ b/Engine/source/gui/buttons/guiToggleButtonCtrl.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 _GUITOGGLEBUTTONCTRL_H_ #define _GUITOGGLEBUTTONCTRL_H_ - -#ifndef _GUIBUTTONCTRL_H_ #include "gui/buttons/guiButtonCtrl.h" -#endif class GuiToggleButtonCtrl : public GuiButtonCtrl { diff --git a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h index 893fc156d..8b9a358e3 100644 --- a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h +++ b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GUITOOLBOXBUTTON_H_ #define _GUITOOLBOXBUTTON_H_ - -#ifndef _GUIBUTTONCTRL_H_ #include "gui/buttons/guiButtonCtrl.h" -#endif + #ifndef GFX_Texture_Manager_H_ #include "gfx/gfxTextureManager.h" #endif diff --git a/Engine/source/gui/containers/guiAutoScrollCtrl.h b/Engine/source/gui/containers/guiAutoScrollCtrl.h index 7c5b6d167..5aa5897a3 100644 --- a/Engine/source/gui/containers/guiAutoScrollCtrl.h +++ b/Engine/source/gui/containers/guiAutoScrollCtrl.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 _GUIAUTOSCROLLCTRL_H_ #define _GUIAUTOSCROLLCTRL_H_ diff --git a/Engine/source/gui/containers/guiContainer.h b/Engine/source/gui/containers/guiContainer.h index 4c79846b9..e16c37e7a 100644 --- a/Engine/source/gui/containers/guiContainer.h +++ b/Engine/source/gui/containers/guiContainer.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 _GUICONTAINER_H_ #define _GUICONTAINER_H_ diff --git a/Engine/source/gui/containers/guiCtrlArrayCtrl.h b/Engine/source/gui/containers/guiCtrlArrayCtrl.h index 9e040dcef..e8250cf15 100644 --- a/Engine/source/gui/containers/guiCtrlArrayCtrl.h +++ b/Engine/source/gui/containers/guiCtrlArrayCtrl.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 _GUICTRLARRAYCTRL_H_ #define _GUICTRLARRAYCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif #include "gfx/gfxDevice.h" #include "console/console.h" diff --git a/Engine/source/gui/containers/guiDragAndDropCtrl.h b/Engine/source/gui/containers/guiDragAndDropCtrl.h index 74d9e298a..ac4dc4b84 100644 --- a/Engine/source/gui/containers/guiDragAndDropCtrl.h +++ b/Engine/source/gui/containers/guiDragAndDropCtrl.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 _GUIDRAGANDDROPCTRL_H_ #define _GUIDRAGANDDROPCTRL_H_ diff --git a/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h b/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h index 4dcca66d7..6e4891563 100644 --- a/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h +++ b/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.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 _GUIDYNAMICCTRLARRAYCTRL_H_ #define _GUIDYNAMICCTRLARRAYCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif #include "gfx/gfxDevice.h" #include "console/console.h" diff --git a/Engine/source/gui/containers/guiFormCtrl.h b/Engine/source/gui/containers/guiFormCtrl.h index c33596220..0c7a9f0a1 100644 --- a/Engine/source/gui/containers/guiFormCtrl.h +++ b/Engine/source/gui/containers/guiFormCtrl.h @@ -19,25 +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 _GUIFORMCTRL_H_ #define _GUIFORMCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif - -#ifndef _GUI_PANEL_H_ #include "gui/containers/guiPanel.h" -#endif -#ifndef _GUIMENUBAR_H_ #include "gui/editor/guiMenuBar.h" -#endif -#ifndef _GUICANVAS_H_ #include "gui/core/guiCanvas.h" -#endif #include "console/console.h" #include "console/consoleTypes.h" diff --git a/Engine/source/gui/containers/guiFrameCtrl.h b/Engine/source/gui/containers/guiFrameCtrl.h index 52357cb58..c23c5d3a2 100644 --- a/Engine/source/gui/containers/guiFrameCtrl.h +++ b/Engine/source/gui/containers/guiFrameCtrl.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 _GUIFRAMECTRL_H_ #define _GUIFRAMECTRL_H_ diff --git a/Engine/source/gui/containers/guiPaneCtrl.h b/Engine/source/gui/containers/guiPaneCtrl.h index 9a3bd0901..96e630220 100644 --- a/Engine/source/gui/containers/guiPaneCtrl.h +++ b/Engine/source/gui/containers/guiPaneCtrl.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 _GUIPANECTRL_H_ #define _GUIPANECTRL_H_ diff --git a/Engine/source/gui/containers/guiPanel.h b/Engine/source/gui/containers/guiPanel.h index ac9bc0693..a0b30a469 100644 --- a/Engine/source/gui/containers/guiPanel.h +++ b/Engine/source/gui/containers/guiPanel.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 #ifndef _GUI_PANEL_H_ #define _GUI_PANEL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _GUITICKCTRL_H_ -#include "gui/shiny/guiTickCtrl.h" -#endif -#ifndef _GUICONTAINER_H_ -#include "gui/containers/guiContainer.h" -#endif +#include "gui/shiny/guiTickCtrl.h" + +#include "gui/containers/guiContainer.h" /// The GuiPanel panel is a container that when rendered will render with the profile's fill colors /// diff --git a/Engine/source/gui/containers/guiRolloutCtrl.h b/Engine/source/gui/containers/guiRolloutCtrl.h index f9706fd6a..5b7b9d86a 100644 --- a/Engine/source/gui/containers/guiRolloutCtrl.h +++ b/Engine/source/gui/containers/guiRolloutCtrl.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 _GUI_ROLLOUTCTRL_H_ #define _GUI_ROLLOUTCTRL_H_ diff --git a/Engine/source/gui/containers/guiScrollCtrl.h b/Engine/source/gui/containers/guiScrollCtrl.h index 2a13c4094..2367444e0 100644 --- a/Engine/source/gui/containers/guiScrollCtrl.h +++ b/Engine/source/gui/containers/guiScrollCtrl.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 _GUISCROLLCTRL_H_ #define _GUISCROLLCTRL_H_ diff --git a/Engine/source/gui/containers/guiSplitContainer.h b/Engine/source/gui/containers/guiSplitContainer.h index a2babb2ae..1b848ed1e 100644 --- a/Engine/source/gui/containers/guiSplitContainer.h +++ b/Engine/source/gui/containers/guiSplitContainer.h @@ -19,23 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GUI_SPLTCONTAINER_H_ #define _GUI_SPLTCONTAINER_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _GUICONTAINER_H_ + #include "gui/containers/guiContainer.h" -#endif -#ifndef _GUI_PANEL_H_ #include "gui/containers/guiPanel.h" -#endif -#ifndef _PLATFORMINPUT_H_ + #include "platform/platformInput.h" -#endif - - /// @addtogroup gui_container_group Containers /// diff --git a/Engine/source/gui/containers/guiStackCtrl.h b/Engine/source/gui/containers/guiStackCtrl.h index 129ad786e..fe07fc892 100644 --- a/Engine/source/gui/containers/guiStackCtrl.h +++ b/Engine/source/gui/containers/guiStackCtrl.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 _GUISTACKCTRL_H_ #define _GUISTACKCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif #include "gfx/gfxDevice.h" #include "console/console.h" diff --git a/Engine/source/gui/containers/guiTabBookCtrl.h b/Engine/source/gui/containers/guiTabBookCtrl.h index 12140587f..c1e004e05 100644 --- a/Engine/source/gui/containers/guiTabBookCtrl.h +++ b/Engine/source/gui/containers/guiTabBookCtrl.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 _GUI_TABBOOKCTRL_H_ #define _GUI_TABBOOKCTRL_H_ diff --git a/Engine/source/gui/containers/guiWindowCollapseCtrl.h b/Engine/source/gui/containers/guiWindowCollapseCtrl.h index 278f9194f..371d17118 100644 --- a/Engine/source/gui/containers/guiWindowCollapseCtrl.h +++ b/Engine/source/gui/containers/guiWindowCollapseCtrl.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 _GUIWINDOWCOLLAPSECTRL_H_ #define _GUIWINDOWCOLLAPSECTRL_H_ diff --git a/Engine/source/gui/containers/guiWindowCtrl.h b/Engine/source/gui/containers/guiWindowCtrl.h index 79d6f090a..8af0df5a6 100644 --- a/Engine/source/gui/containers/guiWindowCtrl.h +++ b/Engine/source/gui/containers/guiWindowCtrl.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 _GUIWINDOWCTRL_H_ #define _GUIWINDOWCTRL_H_ diff --git a/Engine/source/gui/controls/gui3DProjectionCtrl.h b/Engine/source/gui/controls/gui3DProjectionCtrl.h index 939a28f92..a64270724 100644 --- a/Engine/source/gui/controls/gui3DProjectionCtrl.h +++ b/Engine/source/gui/controls/gui3DProjectionCtrl.h @@ -5,6 +5,8 @@ // // //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GUI3DPROJECTIONCTRL_H_ #define _GUI3DPROJECTIONCTRL_H_ diff --git a/Engine/source/gui/controls/guiAnimBitmapCtrl.h b/Engine/source/gui/controls/guiAnimBitmapCtrl.h index e7cf08754..ea74831f3 100644 --- a/Engine/source/gui/controls/guiAnimBitmapCtrl.h +++ b/Engine/source/gui/controls/guiAnimBitmapCtrl.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 _GUIANIMBITMAPCTRL_H_ #define _GUIANIMBITMAPCTRL_H_ - -#ifndef _GUIBITMAPCTRL_H_ #include "gui/controls/guiBitmapCtrl.h" -#endif class guiAnimBitmapCtrl : public GuiBitmapCtrl { diff --git a/Engine/source/gui/controls/guiBackgroundCtrl.h b/Engine/source/gui/controls/guiBackgroundCtrl.h index 2c744fa64..7a5138f57 100644 --- a/Engine/source/gui/controls/guiBackgroundCtrl.h +++ b/Engine/source/gui/controls/guiBackgroundCtrl.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 _GUIBACKGROUNDCTRL_H_ #define _GUIBACKGROUNDCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif /// Renders a background, so you can have a backdrop for your GUI. class GuiBackgroundCtrl : public GuiControl diff --git a/Engine/source/gui/controls/guiBitmapBarCtrl.h b/Engine/source/gui/controls/guiBitmapBarCtrl.h index b98df4863..0e076cb00 100644 --- a/Engine/source/gui/controls/guiBitmapBarCtrl.h +++ b/Engine/source/gui/controls/guiBitmapBarCtrl.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 _GUIBITMAPBARCTRL_H_ #define _GUIBITMAPBARCTRL_H_ - -#ifndef _GUIBITMAPCTRL_H_ #include "gui/controls/guiBitmapCtrl.h" -#endif class GuiBitmapBarCtrl : public GuiBitmapCtrl { diff --git a/Engine/source/gui/controls/guiBitmapCtrl.h b/Engine/source/gui/controls/guiBitmapCtrl.h index ab44fdec2..b2d463f27 100644 --- a/Engine/source/gui/controls/guiBitmapCtrl.h +++ b/Engine/source/gui/controls/guiBitmapCtrl.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 _GUIBITMAPCTRL_H_ #define _GUIBITMAPCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif #include "T3D/assets/ImageAsset.h" /// Renders a bitmap. diff --git a/Engine/source/gui/controls/guiColorPicker.h b/Engine/source/gui/controls/guiColorPicker.h index 181065030..9d2224afb 100644 --- a/Engine/source/gui/controls/guiColorPicker.h +++ b/Engine/source/gui/controls/guiColorPicker.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 _GUICOLORPICKER_H_ #define _GUICOLORPICKER_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif //---------------------------- /// GuiColorPickerCtrl diff --git a/Engine/source/gui/controls/guiConsole.h b/Engine/source/gui/controls/guiConsole.h index e4c0abe24..497789a5a 100644 --- a/Engine/source/gui/controls/guiConsole.h +++ b/Engine/source/gui/controls/guiConsole.h @@ -19,18 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _GUICONSOLE_H_ #define _GUICONSOLE_H_ - -#ifndef _GUIARRAYCTRL_H_ #include "gui/core/guiArrayCtrl.h" -#endif - -#ifndef _CONSOLE_LOGGER_H_ #include "console/consoleLogger.h" -#endif - class GuiConsole : public GuiArrayCtrl { diff --git a/Engine/source/gui/controls/guiConsoleEditCtrl.h b/Engine/source/gui/controls/guiConsoleEditCtrl.h index e37a6f836..8062143cc 100644 --- a/Engine/source/gui/controls/guiConsoleEditCtrl.h +++ b/Engine/source/gui/controls/guiConsoleEditCtrl.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 _GUICONSOLEEDITCTRL_H_ #define _GUICONSOLEEDITCTRL_H_ - -#ifndef _GUITYPES_H_ #include "gui/core/guiTypes.h" -#endif -#ifndef _GUITEXTEDITCTRL_H_ + #include "gui/controls/guiTextEditCtrl.h" -#endif -#ifndef _GUISCROLLCTRL_H_ + #include "gui/containers/guiScrollCtrl.h" -#endif class GuiConsoleEditCtrl : public GuiTextEditCtrl { diff --git a/Engine/source/gui/controls/guiConsoleTextCtrl.h b/Engine/source/gui/controls/guiConsoleTextCtrl.h index 47351cd31..7106ca9bd 100644 --- a/Engine/source/gui/controls/guiConsoleTextCtrl.h +++ b/Engine/source/gui/controls/guiConsoleTextCtrl.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 _GUICONSOLETEXTCTRL_H_ #define _GUICONSOLETEXTCTRL_H_ - -#ifndef _GFONT_H_ #include "gfx/gFont.h" -#endif -#ifndef _GUITYPES_H_ + #include "gui/core/guiTypes.h" -#endif -#ifndef _GUICONTROL_H_ + #include "gui/core/guiControl.h" -#endif class GuiConsoleTextCtrl : public GuiControl { diff --git a/Engine/source/gui/controls/guiDecoyCtrl.h b/Engine/source/gui/controls/guiDecoyCtrl.h index f1171b169..49db4bae2 100644 --- a/Engine/source/gui/controls/guiDecoyCtrl.h +++ b/Engine/source/gui/controls/guiDecoyCtrl.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 _GUIDECOYCTRL_H_ #define _GUIDECOYCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif class GuiDecoyCtrl : public GuiControl { diff --git a/Engine/source/gui/controls/guiDirectoryFileListCtrl.h b/Engine/source/gui/controls/guiDirectoryFileListCtrl.h index 46462504d..63d928bfb 100644 --- a/Engine/source/gui/controls/guiDirectoryFileListCtrl.h +++ b/Engine/source/gui/controls/guiDirectoryFileListCtrl.h @@ -19,17 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GUI_DIRECTORYFILELISTCTRL_H_ #define _GUI_DIRECTORYFILELISTCTRL_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif - -#ifndef _GUI_LISTBOXCTRL_H_ #include "gui/controls/guiListBoxCtrl.h" -#endif class GuiDirectoryFileListCtrl : public GuiListBoxCtrl { diff --git a/Engine/source/gui/controls/guiFileTreeCtrl.h b/Engine/source/gui/controls/guiFileTreeCtrl.h index 49871b3a7..064a31ec3 100644 --- a/Engine/source/gui/controls/guiFileTreeCtrl.h +++ b/Engine/source/gui/controls/guiFileTreeCtrl.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 _GUI_FILETREECTRL_H_ #define _GUI_FILETREECTRL_H_ diff --git a/Engine/source/gui/controls/guiGameListMenuCtrl.h b/Engine/source/gui/controls/guiGameListMenuCtrl.h index a860d8f00..512bab505 100644 --- a/Engine/source/gui/controls/guiGameListMenuCtrl.h +++ b/Engine/source/gui/controls/guiGameListMenuCtrl.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 _GuiGameListMenuCtrl_H_ #define _GuiGameListMenuCtrl_H_ diff --git a/Engine/source/gui/controls/guiGameListOptionsCtrl.h b/Engine/source/gui/controls/guiGameListOptionsCtrl.h index e78b8d974..daf5e5bdf 100644 --- a/Engine/source/gui/controls/guiGameListOptionsCtrl.h +++ b/Engine/source/gui/controls/guiGameListOptionsCtrl.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 _GuiGameListOptionsCtrl_H_ #define _GuiGameListOptionsCtrl_H_ diff --git a/Engine/source/gui/controls/guiGameSettingsCtrl.h b/Engine/source/gui/controls/guiGameSettingsCtrl.h index 6c2f69d70..ea00f6d3c 100644 --- a/Engine/source/gui/controls/guiGameSettingsCtrl.h +++ b/Engine/source/gui/controls/guiGameSettingsCtrl.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 _GuiGameSettingsCtrl_H_ #define _GuiGameSettingsCtrl_H_ diff --git a/Engine/source/gui/controls/guiGradientCtrl.h b/Engine/source/gui/controls/guiGradientCtrl.h index 2d4ab01bb..8a0f3a858 100644 --- a/Engine/source/gui/controls/guiGradientCtrl.h +++ b/Engine/source/gui/controls/guiGradientCtrl.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 +#pragma once #ifndef _GUIGRADIENTCTRL_H_ #define _GUIGRADIENTCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _GUISWATCHBUTTONCTRL_H_ #include "gui/buttons/guiSwatchButtonCtrl.h" -#endif class GuiGradientSwatchCtrl : public GuiSwatchButtonCtrl { diff --git a/Engine/source/gui/controls/guiListBoxCtrl.h b/Engine/source/gui/controls/guiListBoxCtrl.h index 12a213452..99723eb47 100644 --- a/Engine/source/gui/controls/guiListBoxCtrl.h +++ b/Engine/source/gui/controls/guiListBoxCtrl.h @@ -19,29 +19,19 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GUI_LISTBOXCTRL_H_ #define _GUI_LISTBOXCTRL_H_ - -#ifndef _CONSOLETYPES_H_ #include "console/consoleTypes.h" -#endif -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _DGL_H_ #include "gfx/gfxDevice.h" -#endif #ifndef _H_GUIDEFAULTCONTROLRENDER_ #include "gui/core/guiDefaultControlRender.h" #endif - -#ifndef _GUISCROLLCTRL_H_ #include "gui/containers/guiScrollCtrl.h" -#endif - class GuiListBoxCtrl : public GuiControl { diff --git a/Engine/source/gui/controls/guiMLTextCtrl.h b/Engine/source/gui/controls/guiMLTextCtrl.h index fb825a451..b7a20b39c 100644 --- a/Engine/source/gui/controls/guiMLTextCtrl.h +++ b/Engine/source/gui/controls/guiMLTextCtrl.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 _GUIMLTEXTCTRL_H_ #define _GUIMLTEXTCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _STRINGBUFFER_H_ #include "core/stringBuffer.h" -#endif #ifndef SOUND_ASSET_H #include "T3D/assets/SoundAsset.h" diff --git a/Engine/source/gui/controls/guiMLTextEditCtrl.h b/Engine/source/gui/controls/guiMLTextEditCtrl.h index 5e8d5411f..49db7603b 100644 --- a/Engine/source/gui/controls/guiMLTextEditCtrl.h +++ b/Engine/source/gui/controls/guiMLTextEditCtrl.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 _GUIMLTEXTEDITCTRL_H_ #define _GUIMLTEXTEDITCTRL_H_ - -#ifndef _GUIMLTEXTCTRL_H_ #include "gui/controls/guiMLTextCtrl.h" -#endif class GuiMLTextEditCtrl : public GuiMLTextCtrl { diff --git a/Engine/source/gui/controls/guiMaterialCtrl.h b/Engine/source/gui/controls/guiMaterialCtrl.h index 8a9ea343b..7574ff9a0 100644 --- a/Engine/source/gui/controls/guiMaterialCtrl.h +++ b/Engine/source/gui/controls/guiMaterialCtrl.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 _GUIMATERIALCTRL_H_ #define _GUIMATERIALCTRL_H_ - -#ifndef _GUICONTAINER_H_ #include "gui/containers/guiContainer.h" -#endif #include "T3D/assets/MaterialAsset.h" diff --git a/Engine/source/gui/controls/guiPopUpCtrl.h b/Engine/source/gui/controls/guiPopUpCtrl.h index 0528612ea..e57dcf5a7 100644 --- a/Engine/source/gui/controls/guiPopUpCtrl.h +++ b/Engine/source/gui/controls/guiPopUpCtrl.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 _GUIPOPUPCTRL_H_ #define _GUIPOPUPCTRL_H_ - -#ifndef _GUITEXTCTRL_H_ #include "gui/controls/guiTextCtrl.h" -#endif -#ifndef _GUITEXTLISTCTRL_H_ + #include "gui/controls/guiTextListCtrl.h" -#endif -#ifndef _GUIBUTTONCTRL_H_ + #include "gui/buttons/guiButtonCtrl.h" -#endif -#ifndef _GUIBACKGROUNDCTRL_H_ + #include "gui/controls/guiBackgroundCtrl.h" -#endif -#ifndef _GUISCROLLCTRL_H_ + #include "gui/containers/guiScrollCtrl.h" -#endif #include "T3D/assets/ImageAsset.h" class GuiPopUpMenuCtrl; diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.h b/Engine/source/gui/controls/guiPopUpCtrlEx.h index b6501d991..70a6db198 100644 --- a/Engine/source/gui/controls/guiPopUpCtrlEx.h +++ b/Engine/source/gui/controls/guiPopUpCtrlEx.h @@ -19,22 +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 _GUIPOPUPCTRLEX_H_ #define _GUIPOPUPCTRLEX_H_ - -#ifndef _GUITEXTCTRL_H_ #include "gui/controls/guiTextCtrl.h" -#endif -#ifndef _GUITEXTLISTCTRL_H_ + #include "gui/controls/guiTextListCtrl.h" -#endif -#ifndef _GUIBUTTONCTRL_H_ + #include "gui/buttons/guiButtonCtrl.h" -#endif -#ifndef _GUISCROLLCTRL_H_ + #include "gui/containers/guiScrollCtrl.h" -#endif + #include "guiTextEditCtrl.h" class GuiPopUpMenuCtrlEx; class GuiPopupTextListCtrlEx; diff --git a/Engine/source/gui/controls/guiSliderCtrl.h b/Engine/source/gui/controls/guiSliderCtrl.h index c3ab1dc64..1342cb84d 100644 --- a/Engine/source/gui/controls/guiSliderCtrl.h +++ b/Engine/source/gui/controls/guiSliderCtrl.h @@ -19,14 +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 _GUISLIDERCTRL_H_ #define _GUISLIDERCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif - /// A slider control that selects out of a floating-point value range. class GuiSliderCtrl : public GuiControl diff --git a/Engine/source/gui/controls/guiTabPageCtrl.h b/Engine/source/gui/controls/guiTabPageCtrl.h index b588ae5e8..b1aa1282b 100644 --- a/Engine/source/gui/controls/guiTabPageCtrl.h +++ b/Engine/source/gui/controls/guiTabPageCtrl.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 _GUITABPAGECTRL_H_ #define _GUITABPAGECTRL_H_ - -#ifndef _GUITEXTCTRL_H_ #include "gui/controls/guiTextCtrl.h" -#endif class GuiTabPageCtrl : public GuiTextCtrl { diff --git a/Engine/source/gui/controls/guiTextCtrl.h b/Engine/source/gui/controls/guiTextCtrl.h index cdf56e199..8c1cf87a9 100644 --- a/Engine/source/gui/controls/guiTextCtrl.h +++ b/Engine/source/gui/controls/guiTextCtrl.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 _GUITEXTCTRL_H_ #define _GUITEXTCTRL_H_ - -#ifndef _GFONT_H_ #include "gfx/gFont.h" -#endif -#ifndef _GUITYPES_H_ + #include "gui/core/guiTypes.h" -#endif -#ifndef _GUICONTAINER_H_ + #include "gui/containers/guiContainer.h" -#endif class GuiTextCtrl : public GuiContainer { diff --git a/Engine/source/gui/controls/guiTextEditCtrl.h b/Engine/source/gui/controls/guiTextEditCtrl.h index 5d09a5605..24e922a48 100644 --- a/Engine/source/gui/controls/guiTextEditCtrl.h +++ b/Engine/source/gui/controls/guiTextEditCtrl.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 _GUITEXTEDITCTRL_H_ #define _GUITEXTEDITCTRL_H_ - -#ifndef _GUITYPES_H_ #include "gui/core/guiTypes.h" -#endif -#ifndef _GUITEXTCTRL_H_ + #include "gui/controls/guiTextCtrl.h" -#endif -#ifndef _STRINGBUFFER_H_ + #include "core/stringBuffer.h" -#endif class SFXTrack; diff --git a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h index 76fd67735..01a57cd1f 100644 --- a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h +++ b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.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 _GUITEXTEDITSLIDERBITMAPCTRL_H_ #define _GUITEXTEDITSLIDERBITMAPCTRL_H_ - -#ifndef _GUITYPES_H_ #include "gui/core/guiTypes.h" -#endif -#ifndef _GUITEXTEDITCTRL_H_ + #include "gui/controls/guiTextEditCtrl.h" -#endif class GuiTextEditSliderBitmapCtrl : public GuiTextEditCtrl { diff --git a/Engine/source/gui/controls/guiTextEditSliderCtrl.h b/Engine/source/gui/controls/guiTextEditSliderCtrl.h index 9b348b5ea..183f8a3b3 100644 --- a/Engine/source/gui/controls/guiTextEditSliderCtrl.h +++ b/Engine/source/gui/controls/guiTextEditSliderCtrl.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 _GUITEXTEDITSLIDERCTRL_H_ #define _GUITEXTEDITSLIDERCTRL_H_ - -#ifndef _GUITYPES_H_ #include "gui/core/guiTypes.h" -#endif -#ifndef _GUITEXTEDITCTRL_H_ + #include "gui/controls/guiTextEditCtrl.h" -#endif class GuiTextEditSliderCtrl : public GuiTextEditCtrl { diff --git a/Engine/source/gui/controls/guiTextListCtrl.h b/Engine/source/gui/controls/guiTextListCtrl.h index 39d5df642..441d600ff 100644 --- a/Engine/source/gui/controls/guiTextListCtrl.h +++ b/Engine/source/gui/controls/guiTextListCtrl.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 _GUITEXTLISTCTRL_H_ #define _GUITEXTLISTCTRL_H_ - -#ifndef _GUIARRAYCTRL_H_ #include "gui/core/guiArrayCtrl.h" -#endif class GuiTextListCtrl : public GuiArrayCtrl { diff --git a/Engine/source/gui/core/guiArrayCtrl.h b/Engine/source/gui/core/guiArrayCtrl.h index 09d3baff7..823075c7b 100644 --- a/Engine/source/gui/core/guiArrayCtrl.h +++ b/Engine/source/gui/core/guiArrayCtrl.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 _GUIARRAYCTRL_H_ #define _GUIARRAYCTRL_H_ - -#ifndef _GUITYPES_H_ #include "gui/core/guiTypes.h" -#endif -#ifndef _GUITEXTCTRL_H_ + #include "gui/controls/guiTextCtrl.h" -#endif /// Renders a grid of cells. class GuiArrayCtrl : public GuiControl diff --git a/Engine/source/gui/core/guiCanvas.h b/Engine/source/gui/core/guiCanvas.h index 9e66076af..6f1672f1f 100644 --- a/Engine/source/gui/core/guiCanvas.h +++ b/Engine/source/gui/core/guiCanvas.h @@ -24,23 +24,18 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _GUICANVAS_H_ #define _GUICANVAS_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _GUICONTROL_H_ -#include "gui/core/guiControl.h" -#endif -#ifndef _PLATFORMINPUT_H_ -#include "platform/platformInput.h" -#endif -#ifndef _SIGNAL_H_ +#include "gui/core/guiControl.h" + +#include "platform/platformInput.h" + #include "core/util/tSignal.h" -#endif #include "platform/input/IProcessInput.h" #include "windowManager/platformWindowMgr.h" diff --git a/Engine/source/gui/core/guiControl.h b/Engine/source/gui/core/guiControl.h index 5b99124bd..8e06a878d 100644 --- a/Engine/source/gui/core/guiControl.h +++ b/Engine/source/gui/core/guiControl.h @@ -24,31 +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 _GUICONTROL_H_ #define _GUICONTROL_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _MRECT_H_ + #include "math/mRect.h" -#endif -#ifndef _COLOR_H_ + #include "core/color.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif -#ifndef _GUITYPES_H_ + #include "gui/core/guiTypes.h" -#endif -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif -#ifndef _LANG_H_ + #include "i18n/lang.h" -#endif class GuiCanvas; class GuiEditCtrl; diff --git a/Engine/source/gui/core/guiDefaultControlRender.h b/Engine/source/gui/core/guiDefaultControlRender.h index 9f07c0975..9e6d9707e 100644 --- a/Engine/source/gui/core/guiDefaultControlRender.h +++ b/Engine/source/gui/core/guiDefaultControlRender.h @@ -22,10 +22,7 @@ #ifndef _H_GUIDEFAULTCONTROLRENDER_ #define _H_GUIDEFAULTCONTROLRENDER_ - -#ifndef _MRECT_H_ #include "math/mRect.h" -#endif class GuiControlProfile; class ColorI; diff --git a/Engine/source/gui/core/guiOffscreenCanvas.h b/Engine/source/gui/core/guiOffscreenCanvas.h index de8c221b8..ca74405da 100644 --- a/Engine/source/gui/core/guiOffscreenCanvas.h +++ b/Engine/source/gui/core/guiOffscreenCanvas.h @@ -1,13 +1,12 @@ +#pragma once +#pragma once #ifndef _GUIOFFSCREENCANVAS_H_ #define _GUIOFFSCREENCANVAS_H_ #include "math/mMath.h" #include "gui/core/guiCanvas.h" #include "core/util/tVector.h" - -#ifndef _MATTEXTURETARGET_H_ #include "materials/matTextureTarget.h" -#endif class GuiTextureDebug; diff --git a/Engine/source/gui/core/guiScriptNotifyControl.h b/Engine/source/gui/core/guiScriptNotifyControl.h index 29f658a9e..43875d994 100644 --- a/Engine/source/gui/core/guiScriptNotifyControl.h +++ b/Engine/source/gui/core/guiScriptNotifyControl.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 _GUISCRIPTNOTIFYCTRL_H_ #define _GUISCRIPTNOTIFYCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif class GuiScriptNotifyCtrl : public GuiControl { diff --git a/Engine/source/gui/core/guiTypes.h b/Engine/source/gui/core/guiTypes.h index 9c21e54de..c17790998 100644 --- a/Engine/source/gui/core/guiTypes.h +++ b/Engine/source/gui/core/guiTypes.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 _GUITYPES_H_ #define _GUITYPES_H_ - -#ifndef _GFONT_H_ #include "gfx/gFont.h" -#endif -#ifndef _COLOR_H_ + #include "core/color.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif -#ifndef _DYNAMIC_CONSOLETYPES_H_ #include "console/dynamicTypes.h" -#endif #ifndef SOUND_ASSET_H_ #include "T3D/assets/SoundAsset.h" diff --git a/Engine/source/gui/editor/editorFunctions.h b/Engine/source/gui/editor/editorFunctions.h index d304412f6..bd414d197 100644 --- a/Engine/source/gui/editor/editorFunctions.h +++ b/Engine/source/gui/editor/editorFunctions.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 _EDITORFUNCTIONS_H_ #define _EDITORFUNCTIONS_H_ diff --git a/Engine/source/gui/editor/guiDebugger.h b/Engine/source/gui/editor/guiDebugger.h index 3537ae759..a36229a79 100644 --- a/Engine/source/gui/editor/guiDebugger.h +++ b/Engine/source/gui/editor/guiDebugger.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 _GUIDEBUGGER_H_ #define _GUIDEBUGGER_H_ - -#ifndef _GUIARRAYCTRL_H_ #include "gui/core/guiArrayCtrl.h" -#endif class DbgFileView : public GuiArrayCtrl { diff --git a/Engine/source/gui/editor/guiEaseViewCtrl.h b/Engine/source/gui/editor/guiEaseViewCtrl.h index 937ad2371..92edef981 100644 --- a/Engine/source/gui/editor/guiEaseViewCtrl.h +++ b/Engine/source/gui/editor/guiEaseViewCtrl.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 _GUIEASEVIEWCTRL_H_ #define _GUIEASEVIEWCTRL_H_ diff --git a/Engine/source/gui/editor/guiEditCtrl.h b/Engine/source/gui/editor/guiEditCtrl.h index 3e1fbb4d3..9996c0f14 100644 --- a/Engine/source/gui/editor/guiEditCtrl.h +++ b/Engine/source/gui/editor/guiEditCtrl.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 _GUIEDITCTRL_H_ #define _GUIEDITCTRL_H_ diff --git a/Engine/source/gui/editor/guiFilterCtrl.h b/Engine/source/gui/editor/guiFilterCtrl.h index 7f5a92101..a42945385 100644 --- a/Engine/source/gui/editor/guiFilterCtrl.h +++ b/Engine/source/gui/editor/guiFilterCtrl.h @@ -19,14 +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 _GUIFILTERCTRL_H_ #define _GUIFILTERCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif - class Filter: public Vector { diff --git a/Engine/source/gui/editor/guiGraphCtrl.h b/Engine/source/gui/editor/guiGraphCtrl.h index 72c367cfe..e573ab2be 100644 --- a/Engine/source/gui/editor/guiGraphCtrl.h +++ b/Engine/source/gui/editor/guiGraphCtrl.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 _GUIGRAPHCTRL_H_ #define _GUIGRAPHCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif class GuiGraphCtrl : public GuiControl { diff --git a/Engine/source/gui/editor/guiImageList.h b/Engine/source/gui/editor/guiImageList.h index 389d8cf58..09954a997 100644 --- a/Engine/source/gui/editor/guiImageList.h +++ b/Engine/source/gui/editor/guiImageList.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 _GUIIMAGELIST_H_ #define _GUIIMAGELIST_H_ #include "console/simDatablock.h" - -#ifndef _GUITYPES_H_ #include "gui/core/guiTypes.h" -#endif - class GuiImageList : public SimObject { diff --git a/Engine/source/gui/editor/guiInspector.h b/Engine/source/gui/editor/guiInspector.h index 25d328bf0..73437c9aa 100644 --- a/Engine/source/gui/editor/guiInspector.h +++ b/Engine/source/gui/editor/guiInspector.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 _GUI_INSPECTOR_H_ #define _GUI_INSPECTOR_H_ diff --git a/Engine/source/gui/editor/guiInspectorTypes.h b/Engine/source/gui/editor/guiInspectorTypes.h index 839d51718..6bf869450 100644 --- a/Engine/source/gui/editor/guiInspectorTypes.h +++ b/Engine/source/gui/editor/guiInspectorTypes.h @@ -19,32 +19,21 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GUI_INSPECTOR_TYPES_H_ #define _GUI_INSPECTOR_TYPES_H_ - -#ifndef _GUI_INSPECTOR_H_ #include "gui/editor/guiInspector.h" -#endif -#ifndef _GUI_INSPECTOR_FIELD_H_ #include "gui/editor/inspector/field.h" -#endif -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _GUICHECKBOXCTRL_H_ #include "gui/buttons/guiCheckBoxCtrl.h" -#endif -#ifndef _GUIBITMAPBUTTON_H_ #include "gui/buttons/guiBitmapButtonCtrl.h" -#endif -#ifndef _GUITEXTEDITSLIDERCTRL_H_ #include "gui/controls/guiTextEditSliderCtrl.h" -#endif + #include "gui/controls/guiPopUpCtrlEx.h" class GuiPopUpMenuCtrl; diff --git a/Engine/source/gui/editor/guiMenuBar.h b/Engine/source/gui/editor/guiMenuBar.h index 600f92a91..be67d4cfe 100644 --- a/Engine/source/gui/editor/guiMenuBar.h +++ b/Engine/source/gui/editor/guiMenuBar.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 _GUIMENUBAR_H_ #define _GUIMENUBAR_H_ - -#ifndef _GUITICKCTRL_H_ #include "gui/shiny/guiTickCtrl.h" -#endif -#ifndef _POPUPMENU_H_ #include "gui/editor/popupMenu.h" -#endif class GuiMenuBar; class WindowInputGenerator; diff --git a/Engine/source/gui/editor/guiParticleGraphCtrl.h b/Engine/source/gui/editor/guiParticleGraphCtrl.h index b61157021..ff32aa1a1 100644 --- a/Engine/source/gui/editor/guiParticleGraphCtrl.h +++ b/Engine/source/gui/editor/guiParticleGraphCtrl.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 _GUIPARTICLEGRAPHCTRL_H_ #define _GUIPARTICLEGRAPHCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _STRINGTABLE_H_ -#include "core/stringTable.h" -#endif +#include "core/stringTable.h" class GuiParticleGraphCtrl : public GuiControl { diff --git a/Engine/source/gui/editor/guiPopupMenuCtrl.h b/Engine/source/gui/editor/guiPopupMenuCtrl.h index f54fa8d8c..944507bb0 100644 --- a/Engine/source/gui/editor/guiPopupMenuCtrl.h +++ b/Engine/source/gui/editor/guiPopupMenuCtrl.h @@ -24,18 +24,9 @@ #ifndef GUI_POPUP_MENU_CTRL_H #define GUI_POPUP_MENU_CTRL_H - -#ifndef _GUITEXTLISTCTRL_H_ #include "gui/controls/guiTextListCtrl.h" -#endif -#ifndef _GUIMENUBAR_H_ #include "gui/editor/guiMenuBar.h" -#endif - -#ifndef _POPUPMENU_H_ -#include "platform/menus/popupMenu.h" -#endif class GuiPopupMenuBackgroundCtrl; @@ -90,4 +81,4 @@ public: GuiMenuBar* mMenuBarCtrl; }; -#endif \ No newline at end of file +#endif diff --git a/Engine/source/gui/editor/guiRectHandles.h b/Engine/source/gui/editor/guiRectHandles.h index fb6cd18d5..5145aaee9 100644 --- a/Engine/source/gui/editor/guiRectHandles.h +++ b/Engine/source/gui/editor/guiRectHandles.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 _GUIRECTHANDLES_H_ #define _GUIRECTHANDLES_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif class GuiRectHandles : public GuiControl { diff --git a/Engine/source/gui/editor/guiSeparatorCtrl.h b/Engine/source/gui/editor/guiSeparatorCtrl.h index a5938dccb..f22114ba4 100644 --- a/Engine/source/gui/editor/guiSeparatorCtrl.h +++ b/Engine/source/gui/editor/guiSeparatorCtrl.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 _GUISEPARATORCTRL_H_ #define _GUISEPARATORCTRL_H_ diff --git a/Engine/source/gui/editor/guiShapeEdPreview.h b/Engine/source/gui/editor/guiShapeEdPreview.h index b9757b8c5..53108426e 100644 --- a/Engine/source/gui/editor/guiShapeEdPreview.h +++ b/Engine/source/gui/editor/guiShapeEdPreview.h @@ -19,9 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _GUISHAPEEDPREVIEW_H_ -#define _GUISHAPEEDPREVIEW_H_ +#pragma once #include "gui/worldEditor/editTSCtrl.h" #include "ts/tsShapeInstance.h" @@ -263,5 +261,3 @@ public: GuiShapeEdPreview(); ~GuiShapeEdPreview(); }; - -#endif diff --git a/Engine/source/gui/editor/inspector/customField.h b/Engine/source/gui/editor/inspector/customField.h index 41b70c382..a33da218d 100644 --- a/Engine/source/gui/editor/inspector/customField.h +++ b/Engine/source/gui/editor/inspector/customField.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 _GUI_INSPECTOR_CUSTOMFIELD_H_ #define _GUI_INSPECTOR_CUSTOMFIELD_H_ diff --git a/Engine/source/gui/editor/inspector/datablockField.h b/Engine/source/gui/editor/inspector/datablockField.h index 6c635b1ab..984c5eea4 100644 --- a/Engine/source/gui/editor/inspector/datablockField.h +++ b/Engine/source/gui/editor/inspector/datablockField.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 _GUI_INSPECTOR_DATABLOCKFIELD_H_ #define _GUI_INSPECTOR_DATABLOCKFIELD_H_ diff --git a/Engine/source/gui/editor/inspector/dynamicField.h b/Engine/source/gui/editor/inspector/dynamicField.h index cca4845e6..5f5415b56 100644 --- a/Engine/source/gui/editor/inspector/dynamicField.h +++ b/Engine/source/gui/editor/inspector/dynamicField.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 _GUI_INSPECTOR_DYNAMICFIELD_H_ #define _GUI_INSPECTOR_DYNAMICFIELD_H_ diff --git a/Engine/source/gui/editor/inspector/dynamicGroup.h b/Engine/source/gui/editor/inspector/dynamicGroup.h index ddfe8ab78..2827ede86 100644 --- a/Engine/source/gui/editor/inspector/dynamicGroup.h +++ b/Engine/source/gui/editor/inspector/dynamicGroup.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 _GUI_INSPECTOR_DYNAMICGROUP_H_ #define _GUI_INSPECTOR_DYNAMICGROUP_H_ diff --git a/Engine/source/gui/editor/inspector/field.h b/Engine/source/gui/editor/inspector/field.h index 2f2a11968..57e55b8e1 100644 --- a/Engine/source/gui/editor/inspector/field.h +++ b/Engine/source/gui/editor/inspector/field.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 _GUI_INSPECTOR_FIELD_H_ #define _GUI_INSPECTOR_FIELD_H_ diff --git a/Engine/source/gui/editor/inspector/group.h b/Engine/source/gui/editor/inspector/group.h index 498e4243f..76c3142a6 100644 --- a/Engine/source/gui/editor/inspector/group.h +++ b/Engine/source/gui/editor/inspector/group.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 _GUI_INSPECTOR_GROUP_H_ #define _GUI_INSPECTOR_GROUP_H_ diff --git a/Engine/source/gui/editor/inspector/variableField.h b/Engine/source/gui/editor/inspector/variableField.h index 694ef379e..e887fc174 100644 --- a/Engine/source/gui/editor/inspector/variableField.h +++ b/Engine/source/gui/editor/inspector/variableField.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 _GUI_INSPECTOR_VARIABLEFIELD_H_ #define _GUI_INSPECTOR_VARIABLEFIELD_H_ - -#ifndef _GUI_INSPECTOR_FIELD_H_ #include "gui/editor/inspector/field.h" -#endif class GuiInspectorGroup; class GuiInspector; diff --git a/Engine/source/gui/editor/inspector/variableGroup.h b/Engine/source/gui/editor/inspector/variableGroup.h index e6f53d719..1a4d7c367 100644 --- a/Engine/source/gui/editor/inspector/variableGroup.h +++ b/Engine/source/gui/editor/inspector/variableGroup.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 _GUI_INSPECTOR_VARIABLEGROUP_H_ #define _GUI_INSPECTOR_VARIABLEGROUP_H_ - -#ifndef _GUI_INSPECTOR_GROUP_H_ #include "gui/editor/inspector/group.h" -#endif // Forward refs class GuiInspector; diff --git a/Engine/source/gui/editor/inspector/variableInspector.h b/Engine/source/gui/editor/inspector/variableInspector.h index 563a74caf..cd81d748b 100644 --- a/Engine/source/gui/editor/inspector/variableInspector.h +++ b/Engine/source/gui/editor/inspector/variableInspector.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GUI_VARIABLEINSPECTOR_H_ #define _GUI_VARIABLEINSPECTOR_H_ - -#ifndef _GUI_INSPECTOR_H_ #include "gui/editor/guiInspector.h" -#endif -#ifndef _GUI_INSPECTOR_VARIABLEGROUP_H_ -#include "gui/editor/inspector/variableGroup.h" -#endif +#include "gui/editor/inspector/variableGroup.h" class GuiVariableInspector : public GuiInspector { diff --git a/Engine/source/gui/editor/popupMenu.h b/Engine/source/gui/editor/popupMenu.h index 265523a79..a75dee366 100644 --- a/Engine/source/gui/editor/popupMenu.h +++ b/Engine/source/gui/editor/popupMenu.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 _POPUPMENU_H_ #define _POPUPMENU_H_ diff --git a/Engine/source/gui/game/guiFadeinBitmapCtrl.h b/Engine/source/gui/game/guiFadeinBitmapCtrl.h index b4c991430..af3a2ee20 100644 --- a/Engine/source/gui/game/guiFadeinBitmapCtrl.h +++ b/Engine/source/gui/game/guiFadeinBitmapCtrl.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 _GUIFADEINBITMAPCTRL_H_ #define _GUIFADEINBITMAPCTRL_H_ diff --git a/Engine/source/gui/game/guiMessageVectorCtrl.h b/Engine/source/gui/game/guiMessageVectorCtrl.h index a98baf23e..9f8fd14b9 100644 --- a/Engine/source/gui/game/guiMessageVectorCtrl.h +++ b/Engine/source/gui/game/guiMessageVectorCtrl.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 _GUIMESSAGEVECTORCTRL_H_ #define _GUIMESSAGEVECTORCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _MESSAGEVECTOR_H_ + #include "gui/utility/messageVector.h" -#endif /// Render a MessageVector (chat HUD) /// diff --git a/Engine/source/gui/game/guiProgressBitmapCtrl.h b/Engine/source/gui/game/guiProgressBitmapCtrl.h index c134ae1a8..1ed28ee56 100644 --- a/Engine/source/gui/game/guiProgressBitmapCtrl.h +++ b/Engine/source/gui/game/guiProgressBitmapCtrl.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 _GuiProgressBitmapCtrl_H_ #define _GuiProgressBitmapCtrl_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _GUITEXTCTRL_H_ #include "gui/controls/guiTextCtrl.h" -#endif #include "T3D/assets/ImageAsset.h" diff --git a/Engine/source/gui/game/guiProgressCtrl.h b/Engine/source/gui/game/guiProgressCtrl.h index a4885224d..8ef00f688 100644 --- a/Engine/source/gui/game/guiProgressCtrl.h +++ b/Engine/source/gui/game/guiProgressCtrl.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 _GUIPROGRESSCTRL_H_ #define _GUIPROGRESSCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _GUITEXTCTRL_H_ #include "gui/controls/guiTextCtrl.h" -#endif - class GuiProgressCtrl : public GuiTextCtrl { diff --git a/Engine/source/gui/shaderEditor/guiShaderEditor.h b/Engine/source/gui/shaderEditor/guiShaderEditor.h index dab333b57..d72de2899 100644 --- a/Engine/source/gui/shaderEditor/guiShaderEditor.h +++ b/Engine/source/gui/shaderEditor/guiShaderEditor.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 +#pragma once #ifndef _GUISHADEREDITOR_H_ #define _GUISHADEREDITOR_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _GFX_GFXDRAWER_H_ #include "gfx/gfxDrawUtil.h" -#endif #ifndef _SHADERNODE_H_ #include "gui/shaderEditor/guiShaderNode.h" diff --git a/Engine/source/gui/shaderEditor/guiShaderNode.h b/Engine/source/gui/shaderEditor/guiShaderNode.h index 630b2c8a1..685ffbf2d 100644 --- a/Engine/source/gui/shaderEditor/guiShaderNode.h +++ b/Engine/source/gui/shaderEditor/guiShaderNode.h @@ -19,22 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SHADERNODE_H_ #define _SHADERNODE_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif - -#ifndef _GFX_GFXDRAWER_H_ #include "gfx/gfxDrawUtil.h" -#endif - enum class NodeTypes { diff --git a/Engine/source/gui/shiny/guiAudioCtrl.h b/Engine/source/gui/shiny/guiAudioCtrl.h index dabd32f60..1e4a77e19 100644 --- a/Engine/source/gui/shiny/guiAudioCtrl.h +++ b/Engine/source/gui/shiny/guiAudioCtrl.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 _GUIAUDIOCTRL_H_ #define _GUIAUDIOCTRL_H_ - -#ifndef _GUITICKCTRL_H_ #include "gui/shiny/guiTickCtrl.h" -#endif #ifndef SOUND_ASSET_H #include "T3D/assets/SoundAsset.h" diff --git a/Engine/source/gui/shiny/guiTickCtrl.h b/Engine/source/gui/shiny/guiTickCtrl.h index ea35c0660..159830193 100644 --- a/Engine/source/gui/shiny/guiTickCtrl.h +++ b/Engine/source/gui/shiny/guiTickCtrl.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 _GUITICKCTRL_H_ #define _GUITICKCTRL_H_ diff --git a/Engine/source/gui/theora/guiTheoraCtrl.h b/Engine/source/gui/theora/guiTheoraCtrl.h index 8209f3cd9..73be85c8a 100644 --- a/Engine/source/gui/theora/guiTheoraCtrl.h +++ b/Engine/source/gui/theora/guiTheoraCtrl.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 _GUITHEORACTRL_H_ #define _GUITHEORACTRL_H_ diff --git a/Engine/source/gui/utility/guiBubbleTextCtrl.h b/Engine/source/gui/utility/guiBubbleTextCtrl.h index 5e0a668ac..36f89a21b 100644 --- a/Engine/source/gui/utility/guiBubbleTextCtrl.h +++ b/Engine/source/gui/utility/guiBubbleTextCtrl.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 _GUIBUBBLETEXTCTRL_H_ #define _GUIBUBBLETEXTCTRL_H_ - -#ifndef _GUITEXTCTRL_H_ #include "gui/controls/guiTextCtrl.h" -#endif -#ifndef _GUIMLTEXTCTRL_H_ + #include "gui/controls/guiMLTextCtrl.h" -#endif /// A single-line text control that displays its text in a multi-line popup when /// clicked. diff --git a/Engine/source/gui/utility/guiInputCtrl.h b/Engine/source/gui/utility/guiInputCtrl.h index 08fd9bfc5..ab7bfbe5d 100644 --- a/Engine/source/gui/utility/guiInputCtrl.h +++ b/Engine/source/gui/utility/guiInputCtrl.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 _GUIINPUTCTRL_H_ #define _GUIINPUTCTRL_H_ diff --git a/Engine/source/gui/utility/guiMouseEventCtrl.h b/Engine/source/gui/utility/guiMouseEventCtrl.h index 91f01aeae..ac4ae393a 100644 --- a/Engine/source/gui/utility/guiMouseEventCtrl.h +++ b/Engine/source/gui/utility/guiMouseEventCtrl.h @@ -19,14 +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 _GUIMOUSEEVENTCTRL_H_ #define _GUIMOUSEEVENTCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif - class GuiMouseEventCtrl : public GuiControl { diff --git a/Engine/source/gui/utility/guiRenderTargetVizCtrl.h b/Engine/source/gui/utility/guiRenderTargetVizCtrl.h index 72c70fd7f..8a5d5b3e4 100644 --- a/Engine/source/gui/utility/guiRenderTargetVizCtrl.h +++ b/Engine/source/gui/utility/guiRenderTargetVizCtrl.h @@ -23,13 +23,8 @@ #ifndef GUIRENDERTARGETVIZCTRL_H #define GUIRENDERTARGETVIZCTRL_H - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _TEXTARGETBIN_MGR_H_ #include "renderInstance/renderTexTargetBinManager.h" -#endif class GuiRenderTargetVizCtrl : public GuiControl { diff --git a/Engine/source/gui/utility/messageVector.h b/Engine/source/gui/utility/messageVector.h index fc5450d43..03660f094 100644 --- a/Engine/source/gui/utility/messageVector.h +++ b/Engine/source/gui/utility/messageVector.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 _MESSAGEVECTOR_H_ #define _MESSAGEVECTOR_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif /// Store a list of chat messages. /// diff --git a/Engine/source/gui/worldEditor/creator.h b/Engine/source/gui/worldEditor/creator.h index a2facfaac..4a703f93d 100644 --- a/Engine/source/gui/worldEditor/creator.h +++ b/Engine/source/gui/worldEditor/creator.h @@ -19,14 +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 _CREATOR_H_ #define _CREATOR_H_ - -#ifndef _GUIARRAYCTRL_H_ #include "gui/core/guiArrayCtrl.h" -#endif - /// Creator tree from old editor. Not used in current editor. class CreatorTree : public GuiArrayCtrl diff --git a/Engine/source/gui/worldEditor/editTSCtrl.h b/Engine/source/gui/worldEditor/editTSCtrl.h index c235713b8..8cfd22546 100644 --- a/Engine/source/gui/worldEditor/editTSCtrl.h +++ b/Engine/source/gui/worldEditor/editTSCtrl.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 _EDITTSCTRL_H_ #define _EDITTSCTRL_H_ - -#ifndef _GUITSCONTROL_H_ #include "gui/3d/guiTSControl.h" -#endif -#ifndef _GIZMO_H_ + #include "gizmo.h" -#endif class TerrainBlock; class MissionArea; diff --git a/Engine/source/gui/worldEditor/editor.h b/Engine/source/gui/worldEditor/editor.h index e4150d3d8..af8d0ce40 100644 --- a/Engine/source/gui/worldEditor/editor.h +++ b/Engine/source/gui/worldEditor/editor.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 _EDITOR_H_ #define _EDITOR_H_ - -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _GUICONTROL_H_ + #include "gui/core/guiControl.h" -#endif class GameBase; diff --git a/Engine/source/gui/worldEditor/editorIconRegistry.h b/Engine/source/gui/worldEditor/editorIconRegistry.h index a058b7ae7..f17d74ed2 100644 --- a/Engine/source/gui/worldEditor/editorIconRegistry.h +++ b/Engine/source/gui/worldEditor/editorIconRegistry.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 _EDITORICONREGISTRY_H_ #define _EDITORICONREGISTRY_H_ - -#ifndef _GFXTEXTUREHANDLE_H_ #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif #include "console/engineAPI.h" diff --git a/Engine/source/gui/worldEditor/gizmo.h b/Engine/source/gui/worldEditor/gizmo.h index 80c985d70..fd164caea 100644 --- a/Engine/source/gui/worldEditor/gizmo.h +++ b/Engine/source/gui/worldEditor/gizmo.h @@ -19,34 +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 _GIZMO_H_ #define _GIZMO_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _COLOR_H_ #include "core/color.h" -#endif -#ifndef _GUITYPES_H_ #include "gui/core/guiTypes.h" -#endif -#ifndef _MATHUTILS_H_ #include "math/mathUtils.h" -#endif - -#ifndef _DYNAMIC_CONSOLETYPES_H_ #include "console/dynamicTypes.h" -#endif - enum GizmoMode { diff --git a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h index f7925c8ee..31e4dac74 100644 --- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h +++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.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 _GUICONVEXSHAPEEDITORCTRL_H_ #define _GUICONVEXSHAPEEDITORCTRL_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _GIZMO_H_ + #include "gui/worldEditor/gizmo.h" -#endif -#ifndef _CONVEXSHAPE_H_ + #include "T3D/convexShape.h" -#endif class GameBase; class GuiConvexEditorUndoAction; diff --git a/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h b/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h index b555418c0..53981343f 100644 --- a/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h +++ b/Engine/source/gui/worldEditor/guiDecalEditorCtrl.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 _GUIDECALEDITORCTRL_H_ #define _GUIDECALEDITORCTRL_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _DECALINSTANCE_H_ + #include "T3D/decal/decalInstance.h" -#endif class GameBase; class Gizmo; diff --git a/Engine/source/gui/worldEditor/guiMissionArea.h b/Engine/source/gui/worldEditor/guiMissionArea.h index d8ad9e74f..afa07ec78 100644 --- a/Engine/source/gui/worldEditor/guiMissionArea.h +++ b/Engine/source/gui/worldEditor/guiMissionArea.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 _GUIMISSIONAREA_H_ #define _GUIMISSIONAREA_H_ - -#ifndef _GUIBITMAPCTRL_H_ #include "gui/controls/guiBitmapCtrl.h" -#endif -#ifndef _GUITYPES_H_ -#include "gui/guiTypes.h" -#endif -#ifndef _MISSIONAREA_H_ + +#include "gui/core/guiTypes.h" + #include "T3D/missionArea.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif class GBitmap; class TerrainBlock; diff --git a/Engine/source/gui/worldEditor/guiMissionAreaEditor.h b/Engine/source/gui/worldEditor/guiMissionAreaEditor.h index 23f695efd..5076a8135 100644 --- a/Engine/source/gui/worldEditor/guiMissionAreaEditor.h +++ b/Engine/source/gui/worldEditor/guiMissionAreaEditor.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 _GUIMISSIONAREAEDITORCTRL_H_ #define _GUIMISSIONAREAEDITORCTRL_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _MISSIONAREA_H_ + #include "T3D/missionArea.h" -#endif class GuiMissionAreaEditorCtrl : public EditTSCtrl { diff --git a/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h b/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h index 0b2bdc3c8..e8f65ec0b 100644 --- a/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h +++ b/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.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 +#pragma once #ifndef _GUITERRPREVIEWCTRL_H_ #define _GUITERRPREVIEWCTRL_H_ - -#ifndef _GUICONTROL_H_ #include "gui/core/guiControl.h" -#endif -#ifndef _GUITSCONTROL_H_ -#include "gui/3d/guiTSControl.h" -#endif -#ifndef _GFX_GFXDRAWER_H_ -#include "gfx/gfxDrawUtil.h" -#endif -#ifndef _TERRAINEDITOR_H_ -#include "gui/worldEditor/terrainEditor.h" -#endif +#include "gui/3d/guiTSControl.h" +#include "gfx/gfxDrawUtil.h" + +#include "gui/worldEditor/terrainEditor.h" class GuiTerrPreviewCtrl : public GuiControl { diff --git a/Engine/source/gui/worldEditor/tSelection.h b/Engine/source/gui/worldEditor/tSelection.h index b231cd8f1..579db622f 100644 --- a/Engine/source/gui/worldEditor/tSelection.h +++ b/Engine/source/gui/worldEditor/tSelection.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 _TSELECTION_H_ #define _TSELECTION_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif - template class Selection : public Vector diff --git a/Engine/source/gui/worldEditor/terrainActions.h b/Engine/source/gui/worldEditor/terrainActions.h index 18e0029ae..0990333e3 100644 --- a/Engine/source/gui/worldEditor/terrainActions.h +++ b/Engine/source/gui/worldEditor/terrainActions.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 _TERRAINACTIONS_H_ #define _TERRAINACTIONS_H_ - -#ifndef _TERRAINEDITOR_H_ #include "gui/worldEditor/terrainEditor.h" -#endif -#ifndef _GUIFILTERCTRL_H_ + #include "gui/editor/guiFilterCtrl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _NOISE2D_H_ + #include "util/noise2d.h" -#endif class TerrainAction { diff --git a/Engine/source/gui/worldEditor/terrainEditor.h b/Engine/source/gui/worldEditor/terrainEditor.h index 8146a520c..7fef61be6 100644 --- a/Engine/source/gui/worldEditor/terrainEditor.h +++ b/Engine/source/gui/worldEditor/terrainEditor.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 _TERRAINEDITOR_H_ #define _TERRAINEDITOR_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _TERRDATA_H_ + #include "terrain/terrData.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif - - // Each 2D grid position must be associated with a terrainBlock struct GridPoint diff --git a/Engine/source/gui/worldEditor/tools/editorTool.h b/Engine/source/gui/worldEditor/tools/editorTool.h index cb1ac690c..ac73fac8b 100644 --- a/Engine/source/gui/worldEditor/tools/editorTool.h +++ b/Engine/source/gui/worldEditor/tools/editorTool.h @@ -22,10 +22,7 @@ #ifndef _EDITOR_TOOL_ #define _EDITOR_TOOL_ - -#ifndef _WORLDEDITOR_H_ #include "gui/worldEditor/worldEditor.h" -#endif class EditorTool : public SimObject { diff --git a/Engine/source/gui/worldEditor/undoActions.h b/Engine/source/gui/worldEditor/undoActions.h index e11d52446..55335d00f 100644 --- a/Engine/source/gui/worldEditor/undoActions.h +++ b/Engine/source/gui/worldEditor/undoActions.h @@ -19,16 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GUI_WORLDEDITOR_UNDOACTIONS_H_ #define _GUI_WORLDEDITOR_UNDOACTIONS_H_ - -#ifndef _UNDO_H_ #include "util/undo.h" -#endif -#ifndef _CONSOLE_SIMOBJECTMEMENTO_H_ #include "console/simObjectMemento.h" -#endif // Need full definition visible for SimObjectPtr #include "gui/editor/inspector/field.h" diff --git a/Engine/source/gui/worldEditor/worldEditor.h b/Engine/source/gui/worldEditor/worldEditor.h index 40cc888a1..dee14a750 100644 --- a/Engine/source/gui/worldEditor/worldEditor.h +++ b/Engine/source/gui/worldEditor/worldEditor.h @@ -19,42 +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 _WORLDEDITOR_H_ #define _WORLDEDITOR_H_ - -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _CONSOLETYPES_H_ #include "console/consoleTypes.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif - -#ifndef _CONSOLE_SIMOBJECTMEMENTO_H_ #include "console/simObjectMemento.h" -#endif -#ifndef _UNDO_H_ #include "util/undo.h" -#endif -#ifndef _SIMPATH_H_ #include "scene/simPath.h" -#endif - -#ifndef _DYNAMIC_CONSOLETYPES_H_ #include "console/dynamicTypes.h" -#endif - class SceneObject; class WorldEditorSelection; diff --git a/Engine/source/gui/worldEditor/worldEditorSelection.h b/Engine/source/gui/worldEditor/worldEditorSelection.h index 99d014c4d..122cbb3da 100644 --- a/Engine/source/gui/worldEditor/worldEditorSelection.h +++ b/Engine/source/gui/worldEditor/worldEditorSelection.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 _WORLDEDITORSELECTION_H_ #define _WORLDEDITORSELECTION_H_ diff --git a/Engine/source/i18n/i18n.h b/Engine/source/i18n/i18n.h index 945cb04f3..acb64e3ce 100644 --- a/Engine/source/i18n/i18n.h +++ b/Engine/source/i18n/i18n.h @@ -25,6 +25,8 @@ // Core strings are out of date so this code is currently disabled. #include "i18n/CoreStrings.h" +#pragma once +#pragma once #ifndef _I18N_H_ #define _I18N_H_ diff --git a/Engine/source/i18n/lang.h b/Engine/source/i18n/lang.h index 8bf2d9797..f4c24be66 100644 --- a/Engine/source/i18n/lang.h +++ b/Engine/source/i18n/lang.h @@ -31,6 +31,8 @@ #include "core/fileObject.h" #include "core/util/str.h" #include "core/strings/unicode.h" +#pragma once +#pragma once #ifndef _LANG_H_ #define _LANG_H_ diff --git a/Engine/source/lighting/advanced/advancedLightBinManager.h b/Engine/source/lighting/advanced/advancedLightBinManager.h index aad445f03..650be96ec 100644 --- a/Engine/source/lighting/advanced/advancedLightBinManager.h +++ b/Engine/source/lighting/advanced/advancedLightBinManager.h @@ -19,29 +19,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _ADVANCEDLIGHTBINMANAGER_H_ -#define _ADVANCEDLIGHTBINMANAGER_H_ - -#ifndef _TEXTARGETBIN_MGR_H_ #include "renderInstance/renderTexTargetBinManager.h" -#endif -#ifndef _TVECTOR_H_ -#include "core/util/tVector.h" -#endif -#ifndef _LIGHTINFO_H_ -#include "lighting/lightInfo.h" -#endif -#ifndef _MATHUTIL_FRUSTUM_H_ -#include "math/util/frustum.h" -#endif -#ifndef _MATINSTANCE_H_ -#include "materials/matInstance.h" -#endif -#ifndef _SHADOW_COMMON_H_ -#include "lighting/shadowMap/shadowCommon.h" -#endif +#include "core/util/tVector.h" + +#include "lighting/lightInfo.h" +#include "math/util/frustum.h" + +#include "materials/matInstance.h" +#include "lighting/shadowMap/shadowCommon.h" class AdvancedLightManager; class ShadowMapManager; @@ -257,5 +245,3 @@ protected: static S32 QSORT_CALLBACK _lightScoreCmp(const LightBinEntry* a, const LightBinEntry* b); }; - -#endif // _ADVANCEDLIGHTBINMANAGER_H_ diff --git a/Engine/source/lighting/advanced/advancedLightBufferConditioner.h b/Engine/source/lighting/advanced/advancedLightBufferConditioner.h index f0c010d5d..801d1e10e 100644 --- a/Engine/source/lighting/advanced/advancedLightBufferConditioner.h +++ b/Engine/source/lighting/advanced/advancedLightBufferConditioner.h @@ -19,13 +19,9 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#ifndef _ADVANCED_LIGHTBUFFER_CONDITIONER_H_ -#define _ADVANCED_LIGHTBUFFER_CONDITIONER_H_ - -#ifndef _CONDITIONER_BASE_H_ + +#pragma once #include "shaderGen/conditionerFeature.h" -#endif - class AdvancedLightBufferConditioner : public ConditionerFeature { @@ -61,5 +57,3 @@ protected: Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override; void printMethodFooter( MethodType methodType, Var *retVar, Stream &stream, MultiLine *meta ) override; }; - -#endif // _ADVANCED_LIGHTBUFFER_CONDITIONER_H_ \ No newline at end of file diff --git a/Engine/source/lighting/advanced/advancedLightManager.h b/Engine/source/lighting/advanced/advancedLightManager.h index 95f0ec5fc..d509d1c12 100644 --- a/Engine/source/lighting/advanced/advancedLightManager.h +++ b/Engine/source/lighting/advanced/advancedLightManager.h @@ -19,38 +19,25 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _ADVANCEDLIGHTMANAGER_H_ -#define _ADVANCEDLIGHTMANAGER_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _LIGHTMANAGER_H_ -#include "lighting/lightManager.h" -#endif -#ifndef _LIGHTINFO_H_ -#include "lighting/lightInfo.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ -#include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXTARGET_H_ -#include "gfx/gfxTarget.h" -#endif -#ifndef _TDICTIONARY_H_ -#include "core/util/tDictionary.h" -#endif -#ifndef _LIGHTSHADOWMAP_H_ -#include "lighting/shadowMap/lightShadowMap.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ -#include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ -#include "gfx/gfxVertexBuffer.h" -#endif +#include "lighting/lightManager.h" + +#include "lighting/lightInfo.h" + +#include "gfx/gfxTextureHandle.h" + +#include "gfx/gfxTarget.h" + +#include "core/util/tDictionary.h" + +#include "lighting/shadowMap/lightShadowMap.h" + +#include "gfx/gfxPrimitiveBuffer.h" + +#include "gfx/gfxVertexBuffer.h" class AvailableSLInterfaces; class AdvancedLightBinManager; @@ -151,4 +138,3 @@ protected: #endif }; -#endif // _ADVANCEDLIGHTMANAGER_H_ diff --git a/Engine/source/lighting/advanced/advancedLightingFeatures.h b/Engine/source/lighting/advanced/advancedLightingFeatures.h index 26831af4c..09ec13ee5 100644 --- a/Engine/source/lighting/advanced/advancedLightingFeatures.h +++ b/Engine/source/lighting/advanced/advancedLightingFeatures.h @@ -19,13 +19,9 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#ifndef _ADVANCEDLIGHTINGFEATURES_H_ -#define _ADVANCEDLIGHTINGFEATURES_H_ - -#ifndef _GFXENUMS_H_ +#pragma once + #include "gfx/gfxEnums.h" -#endif - class AdvancedLightingFeatures { @@ -38,5 +34,3 @@ private: static bool smFeaturesRegistered; }; - -#endif // _ADVANCEDLIGHTINGFEATURES_H_ diff --git a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h index 199d7b3c2..eec65a1bc 100644 --- a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h +++ b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h @@ -19,9 +19,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _DEFERREDFEATURESGLSL_H_ -#define _DEFERREDFEATURESGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" #include "shaderGen/GLSL/bumpGLSL.h" @@ -142,5 +141,3 @@ public: return "Sub-Surface Approximation [Deferred]"; } }; - -#endif // _DEFERREDFEATURESGLSL_H_ diff --git a/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h b/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h index d876cef3a..8aa67be9d 100644 --- a/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h +++ b/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.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 _DEFERREDSHADINGGLSL_H_ #define _DEFERREDSHADINGGLSL_H_ diff --git a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h index d818c10d5..455359bcd 100644 --- a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h +++ b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GBUFFER_CONDITIONER_GLSL_H_ #define _GBUFFER_CONDITIONER_GLSL_H_ - -#ifndef _CONDITIONER_BASE_H_ #include "shaderGen/conditionerFeature.h" -#endif -#ifndef _SHADEROP_H_ -#include "shaderGen/shaderOp.h" -#endif +#include "shaderGen/shaderOp.h" /// class GBufferConditionerGLSL : public ConditionerFeature diff --git a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h index 17dd9b86d..4fcbc5507 100644 --- a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h +++ b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h @@ -19,9 +19,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _DEFERREDFEATURESHLSL_H_ -#define _DEFERREDFEATURESHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" #include "shaderGen/HLSL/bumpHLSL.h" @@ -143,5 +142,3 @@ public: return "Sub-Surface Approximation [Deferred]"; } }; - -#endif // _DEFERREDFEATURESHLSL_H_ diff --git a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h index 472f22115..4e3c1fcc2 100644 --- a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h +++ b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.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 _DEFERREDSHADINGHLSL_H_ #define _DEFERREDSHADINGHLSL_H_ diff --git a/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h b/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h index 1c4fd9b4c..7f2b5123f 100644 --- a/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h +++ b/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _GBUFFER_CONDITIONER_HLSL_H_ #define _GBUFFER_CONDITIONER_HLSL_H_ - -#ifndef _CONDITIONER_BASE_H_ #include "shaderGen/conditionerFeature.h" -#endif -#ifndef _SHADEROP_H_ -#include "shaderGen/shaderOp.h" -#endif +#include "shaderGen/shaderOp.h" /// class GBufferConditionerHLSL : public ConditionerFeature diff --git a/Engine/source/lighting/basic/basicLightManager.h b/Engine/source/lighting/basic/basicLightManager.h index addda5556..5af0c101a 100644 --- a/Engine/source/lighting/basic/basicLightManager.h +++ b/Engine/source/lighting/basic/basicLightManager.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 _BASICLIGHTMANAGER_H_ #define _BASICLIGHTMANAGER_H_ - -#ifndef _LIGHTMANAGER_H_ #include "lighting/lightManager.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif -#ifndef _GFXSHADER_H_ + #include "gfx/gfxShader.h" -#endif -#ifndef _SIMOBJECT_H_ + #include "console/simObject.h" -#endif -#ifndef _TSINGLETON_H_ + #include "core/util/tSingleton.h" -#endif class AvailableSLInterfaces; class GFXShaderConstHandle; diff --git a/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h b/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h index e241b16c5..78320ba13 100644 --- a/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h +++ b/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.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 _BASICSCENEOBJECTLIGHTINGPLUGIN_H_ #define _BASICSCENEOBJECTLIGHTINGPLUGIN_H_ - -#ifndef _SCENEOBJECTLIGHTINGPLUGIN_H_ #include "scene/sceneObjectLightingPlugin.h" -#endif -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _TSINGLETON_H_ #include "core/util/tSingleton.h" -#endif - class ShadowBase; diff --git a/Engine/source/lighting/basic/blTerrainSystem.h b/Engine/source/lighting/basic/blTerrainSystem.h index 6a1b65969..caa34cd9e 100644 --- a/Engine/source/lighting/basic/blTerrainSystem.h +++ b/Engine/source/lighting/basic/blTerrainSystem.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 _BLTERRAINSYSTEM_H_ #define _BLTERRAINSYSTEM_H_ diff --git a/Engine/source/lighting/common/blobShadow.h b/Engine/source/lighting/common/blobShadow.h index 800d1ed78..b3246e509 100644 --- a/Engine/source/lighting/common/blobShadow.h +++ b/Engine/source/lighting/common/blobShadow.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 _BLOBSHADOW_H_ #define _BLOBSHADOW_H_ diff --git a/Engine/source/lighting/common/lightMapParams.h b/Engine/source/lighting/common/lightMapParams.h index cc7ac8eb0..eb50af591 100644 --- a/Engine/source/lighting/common/lightMapParams.h +++ b/Engine/source/lighting/common/lightMapParams.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 _LIGHTMAPPARAMS_H_ #define _LIGHTMAPPARAMS_H_ - -#ifndef _LIGHTINFO_H_ #include "lighting/lightInfo.h" -#endif class LightMapParams : public LightInfoEx { diff --git a/Engine/source/lighting/common/projectedShadow.h b/Engine/source/lighting/common/projectedShadow.h index a8195ae7d..348576e3f 100644 --- a/Engine/source/lighting/common/projectedShadow.h +++ b/Engine/source/lighting/common/projectedShadow.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 _PROJECTEDSHADOW_H_ #define _PROJECTEDSHADOW_H_ - -#ifndef _DEPTHSORTLIST_H_ #include "collision/depthSortList.h" -#endif -#ifndef _SCENEOBJECT_H_ + #include "scene/sceneObject.h" -#endif -#ifndef _TSSHAPEINSTANCE_H_ + #include "ts/tsShapeInstance.h" -#endif -#ifndef _LIGHTINGSYSTEM_SHADOWBASE_H_ #include "lighting/common/shadowBase.h" -#endif class ShapeBase; class LightInfo; diff --git a/Engine/source/lighting/common/sceneLighting.h b/Engine/source/lighting/common/sceneLighting.h index 475bac5ac..874651d38 100644 --- a/Engine/source/lighting/common/sceneLighting.h +++ b/Engine/source/lighting/common/sceneLighting.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 _SCENELIGHTING_H_ #define _SCENELIGHTING_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _SGSCENEPERSIST_H_ + #include "lighting/common/scenePersist.h" -#endif -#ifndef _LIGHTINFO_H_ + #include "lighting/lightInfo.h" -#endif class ShadowVolumeBSP; class LightInfo; diff --git a/Engine/source/lighting/common/scenePersist.h b/Engine/source/lighting/common/scenePersist.h index d02513b7f..fe7e2a467 100644 --- a/Engine/source/lighting/common/scenePersist.h +++ b/Engine/source/lighting/common/scenePersist.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 _SGSCENEPERSIST_H_ #define _SGSCENEPERSIST_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif class Stream; diff --git a/Engine/source/lighting/common/shadowBase.h b/Engine/source/lighting/common/shadowBase.h index 3656435e8..d52003b84 100644 --- a/Engine/source/lighting/common/shadowBase.h +++ b/Engine/source/lighting/common/shadowBase.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 _LIGHTINGSYSTEM_SHADOWBASE_H_ #define _LIGHTINGSYSTEM_SHADOWBASE_H_ diff --git a/Engine/source/lighting/common/shadowVolumeBSP.h b/Engine/source/lighting/common/shadowVolumeBSP.h index da84f5b42..7840a5ca0 100644 --- a/Engine/source/lighting/common/shadowVolumeBSP.h +++ b/Engine/source/lighting/common/shadowVolumeBSP.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 _SHADOWVOLUMEBSP_H_ #define _SHADOWVOLUMEBSP_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif -#ifndef _DATACHUNKER_H_ + #include "core/dataChunker.h" -#endif -#ifndef _LIGHTMANAGER_H_ + #include "lighting/lightManager.h" -#endif /// Used to calculate shadows. class ShadowVolumeBSP diff --git a/Engine/source/lighting/lightInfo.h b/Engine/source/lighting/lightInfo.h index 78001209f..7636a3737 100644 --- a/Engine/source/lighting/lightInfo.h +++ b/Engine/source/lighting/lightInfo.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 _LIGHTINFO_H_ #define _LIGHTINFO_H_ - -#ifndef _GFXSTRUCTS_H_ #include "gfx/gfxStructs.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif struct SceneData; class LightManager; diff --git a/Engine/source/lighting/lightManager.h b/Engine/source/lighting/lightManager.h index 71d3019e5..87ecefaf1 100644 --- a/Engine/source/lighting/lightManager.h +++ b/Engine/source/lighting/lightManager.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 _LIGHTMANAGER_H_ #define _LIGHTMANAGER_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif -#ifndef _TSIGNAL_H_ + #include "core/util/tSignal.h" -#endif -#ifndef _LIGHTINFO_H_ + #include "lighting/lightInfo.h" -#endif -#ifndef _LIGHTQUERY_H_ + #include "lighting/lightQuery.h" -#endif class SimObject; class LightManager; diff --git a/Engine/source/lighting/lightQuery.h b/Engine/source/lighting/lightQuery.h index 7fdeb1e9a..79f005276 100644 --- a/Engine/source/lighting/lightQuery.h +++ b/Engine/source/lighting/lightQuery.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 _LIGHTQUERY_H_ #define _LIGHTQUERY_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MSPHERE_H_ #include "math/mSphere.h" -#endif -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif - class LightManager; class LightInfo; diff --git a/Engine/source/lighting/lightingInterfaces.h b/Engine/source/lighting/lightingInterfaces.h index dc4db77a4..78e848200 100644 --- a/Engine/source/lighting/lightingInterfaces.h +++ b/Engine/source/lighting/lightingInterfaces.h @@ -21,14 +21,9 @@ //----------------------------------------------------------------------------- #ifndef _SG_SYSTEM_INTERFACE_H #define _SG_SYSTEM_INTERFACE_H - -#ifndef _SGSCENEPERSIST_H_ #include "lighting/common/scenePersist.h" -#endif -#ifndef _SCENELIGHTING_H_ #include "lighting/common/sceneLighting.h" -#endif class ObjectProxy; class ObjectProxyList; diff --git a/Engine/source/lighting/shadowManager.h b/Engine/source/lighting/shadowManager.h index 74aa308bc..556efa284 100644 --- a/Engine/source/lighting/shadowManager.h +++ b/Engine/source/lighting/shadowManager.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 +#pragma once #ifndef _SHADOWMANAGER_H_ #define _SHADOWMANAGER_H_ - -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif class SceneManager; diff --git a/Engine/source/lighting/shadowMap/cubeLightShadowMap.h b/Engine/source/lighting/shadowMap/cubeLightShadowMap.h index 462ec28e4..a57a9754c 100644 --- a/Engine/source/lighting/shadowMap/cubeLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/cubeLightShadowMap.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 _CUBELIGHTSHADOWMAP_H_ #define _CUBELIGHTSHADOWMAP_H_ - -#ifndef _LIGHTSHADOWMAP_H_ #include "lighting/shadowMap/lightShadowMap.h" -#endif -#ifndef _GFXCUBEMAP_H_ -#include "gfx/gfxCubemap.h" -#endif +#include "gfx/gfxCubemap.h" class CubeLightShadowMap : public LightShadowMap { diff --git a/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h b/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h index 343649c14..ad9b3cc43 100644 --- a/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.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 _DUALPARABOLOIDLIGHTSHADOWMAP_H_ #define _DUALPARABOLOIDLIGHTSHADOWMAP_H_ - -#ifndef _PARABOLOIDLIGHTSHADOWMAP_H_ #include "lighting/shadowMap/paraboloidLightShadowMap.h" -#endif class DualParaboloidLightShadowMap : public ParaboloidLightShadowMap { diff --git a/Engine/source/lighting/shadowMap/lightShadowMap.h b/Engine/source/lighting/shadowMap/lightShadowMap.h index 35d2f5821..5fab1fa6e 100644 --- a/Engine/source/lighting/shadowMap/lightShadowMap.h +++ b/Engine/source/lighting/shadowMap/lightShadowMap.h @@ -19,40 +19,27 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _LIGHTSHADOWMAP_H_ #define _LIGHTSHADOWMAP_H_ - -#ifndef _GFXTEXTUREHANDLE_H_ #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXCUBEMAP_H_ + #include "gfx/gfxCubemap.h" -#endif -#ifndef _GFXTARGET_H_ + #include "gfx/gfxTarget.h" -#endif -#ifndef _LIGHTINFO_H_ + #include "lighting/lightInfo.h" -#endif -#ifndef _MATHUTIL_FRUSTUM_H_ #include "math/util/frustum.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif -#ifndef _SHADOW_COMMON_H_ #include "lighting/shadowMap/shadowCommon.h" -#endif -#ifndef _GFXSHADER_H_ + #include "gfx/gfxShader.h" -#endif -#ifndef _GFXOCCLUSIONQUERY_H_ + #include "gfx/gfxOcclusionQuery.h" -#endif -#ifndef _PLATFORM_PLATFORMTIMER_H_ #include "platform/platformTimer.h" -#endif class ShadowMapManager; class SceneManager; diff --git a/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h b/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h index 8b65b9f6d..43546d0f9 100644 --- a/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h @@ -19,14 +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 _PARABOLOIDLIGHTSHADOWMAP_H_ #define _PARABOLOIDLIGHTSHADOWMAP_H_ - -#ifndef _LIGHTSHADOWMAP_H_ #include "lighting/shadowMap/lightShadowMap.h" -#endif - class ParaboloidLightShadowMap : public LightShadowMap { diff --git a/Engine/source/lighting/shadowMap/pssmLightShadowMap.h b/Engine/source/lighting/shadowMap/pssmLightShadowMap.h index d7042feca..7e12c9057 100644 --- a/Engine/source/lighting/shadowMap/pssmLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/pssmLightShadowMap.h @@ -19,16 +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 _PSSMLIGHTSHADOWMAP_H_ #define _PSSMLIGHTSHADOWMAP_H_ - -#ifndef _LIGHTSHADOWMAP_H_ #include "lighting/shadowMap/lightShadowMap.h" -#endif -#ifndef _MATHUTIL_FRUSTUM_H_ #include "math/util/frustum.h" -#endif - class PSSMLightShadowMap : public LightShadowMap { diff --git a/Engine/source/lighting/shadowMap/shadowCommon.h b/Engine/source/lighting/shadowMap/shadowCommon.h index 6818482e7..6348124d7 100644 --- a/Engine/source/lighting/shadowMap/shadowCommon.h +++ b/Engine/source/lighting/shadowMap/shadowCommon.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 _SHADOW_COMMON_H_ #define _SHADOW_COMMON_H_ diff --git a/Engine/source/lighting/shadowMap/shadowMapManager.h b/Engine/source/lighting/shadowMap/shadowMapManager.h index 7e3167aeb..43d5e775f 100644 --- a/Engine/source/lighting/shadowMap/shadowMapManager.h +++ b/Engine/source/lighting/shadowMap/shadowMapManager.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 _SHADOWMAPMANAGER_H_ #define _SHADOWMAPMANAGER_H_ - -#ifndef _TSINGLETON_H_ #include "core/util/tSingleton.h" -#endif -#ifndef _SHADOWMANAGER_H_ + #include "lighting/shadowManager.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _MPOINT4_H_ + #include "math/mPoint4.h" -#endif class LightShadowMap; class ShadowMapPass; diff --git a/Engine/source/lighting/shadowMap/shadowMapPass.h b/Engine/source/lighting/shadowMap/shadowMapPass.h index d16ec622f..335c7816d 100644 --- a/Engine/source/lighting/shadowMap/shadowMapPass.h +++ b/Engine/source/lighting/shadowMap/shadowMapPass.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 _SHADOWMAPPASS_H_ #define _SHADOWMAPPASS_H_ - -#ifndef _RENDERPASSMANAGER_H_ #include "renderInstance/renderPassManager.h" -#endif -#ifndef _RENDERMESHMGR_H_ + #include "renderInstance/renderMeshMgr.h" -#endif -#ifndef _LIGHTINFO_H_ + #include "lighting/lightInfo.h" -#endif -#ifndef _SHADOW_COMMON_H_ #include "lighting/shadowMap/shadowCommon.h" -#endif class RenderMeshMgr; class LightShadowMap; diff --git a/Engine/source/lighting/shadowMap/shadowMatHook.h b/Engine/source/lighting/shadowMap/shadowMatHook.h index e62789eaf..267956c3f 100644 --- a/Engine/source/lighting/shadowMap/shadowMatHook.h +++ b/Engine/source/lighting/shadowMap/shadowMatHook.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 _SHADOWMATHOOK_H_ #define _SHADOWMATHOOK_H_ - -#ifndef _MATINSTANCEHOOK_H_ #include "materials/matInstanceHook.h" -#endif -#ifndef _MATINSTANCE_H_ + #include "materials/matInstance.h" -#endif // TODO: Move ShadowType enum to somewhere // with less dependancies. -#ifndef _SHADOWMAPPASS_H_ #include "lighting/shadowMap/shadowMapPass.h" -#endif class ShadowMatInstance : public MatInstance { diff --git a/Engine/source/lighting/shadowMap/singleLightShadowMap.h b/Engine/source/lighting/shadowMap/singleLightShadowMap.h index 2f26457c8..5af236597 100644 --- a/Engine/source/lighting/shadowMap/singleLightShadowMap.h +++ b/Engine/source/lighting/shadowMap/singleLightShadowMap.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 _SINGLELIGHTSHADOWMAP_H_ #define _SINGLELIGHTSHADOWMAP_H_ - -#ifndef _LIGHTSHADOWMAP_H_ #include "lighting/shadowMap/lightShadowMap.h" -#endif // // SingleLightShadowMap, holds the shadow map and various other things for a light. diff --git a/Engine/source/materials/baseMatInstance.h b/Engine/source/materials/baseMatInstance.h index dffada2ca..1c9ac80c8 100644 --- a/Engine/source/materials/baseMatInstance.h +++ b/Engine/source/materials/baseMatInstance.h @@ -19,39 +19,29 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _BASEMATINSTANCE_H_ #define _BASEMATINSTANCE_H_ - -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _BASEMATERIALDEFINITION_H_ + #include "materials/baseMaterialDefinition.h" -#endif -#ifndef _MATERIALPARAMETERS_H_ + #include "materials/materialParameters.h" -#endif -#ifndef _MMATRIX_H_ + #include "math/mMatrix.h" -#endif -#ifndef _GFXENUMS_H_ + #include "gfx/gfxEnums.h" -#endif -#ifndef _GFXSHADER_H_ + #include "gfx/gfxShader.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif -#ifndef _MATINSTANCEHOOK_H_ + #include "materials/matInstanceHook.h" -#endif -#ifndef _MATSTATEHINT_H_ + #include "materials/matStateHint.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif #ifndef CUSTOMSHADERBINDINGDATA_H #include "materials/customShaderBindingData.h" diff --git a/Engine/source/materials/baseMaterialDefinition.h b/Engine/source/materials/baseMaterialDefinition.h index 6fb40ae80..664826858 100644 --- a/Engine/source/materials/baseMaterialDefinition.h +++ b/Engine/source/materials/baseMaterialDefinition.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 _BASEMATERIALDEFINITION_H_ #define _BASEMATERIALDEFINITION_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif class BaseMatInstance; diff --git a/Engine/source/materials/customMaterialDefinition.h b/Engine/source/materials/customMaterialDefinition.h index 640c376e8..533ad39d0 100644 --- a/Engine/source/materials/customMaterialDefinition.h +++ b/Engine/source/materials/customMaterialDefinition.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 _CUSTOMMATERIALDEFINITION_H_ #define _CUSTOMMATERIALDEFINITION_H_ - -#ifndef _MATERIALDEFINITION_H_ #include "materials/materialDefinition.h" -#endif class ShaderData; class GFXStateBlockData; diff --git a/Engine/source/materials/customShaderBindingData.h b/Engine/source/materials/customShaderBindingData.h index 444fa6b9a..891ea4e4d 100644 --- a/Engine/source/materials/customShaderBindingData.h +++ b/Engine/source/materials/customShaderBindingData.h @@ -2,9 +2,7 @@ #ifndef CUSTOMSHADERBINDINGDATA_H #define CUSTOMSHADERBINDINGDATA_H -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif struct CustomShaderBindingData { diff --git a/Engine/source/materials/matInstance.h b/Engine/source/materials/matInstance.h index 1bdabf1c5..0296ffb8c 100644 --- a/Engine/source/materials/matInstance.h +++ b/Engine/source/materials/matInstance.h @@ -19,24 +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 _MATINSTANCE_H_ #define _MATINSTANCE_H_ - -#ifndef _MATERIALDEFINITION_H_ #include "materials/materialDefinition.h" -#endif -#ifndef _BASEMATINSTANCE_H_ + #include "materials/baseMatInstance.h" -#endif -#ifndef _SCENEDATA_H_ + #include "materials/sceneData.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _FEATURESET_H_ + #include "shaderGen/featureSet.h" -#endif class GFXShader; class GFXCubemap; diff --git a/Engine/source/materials/matInstanceHook.h b/Engine/source/materials/matInstanceHook.h index 7fbe88aa9..99bace5e3 100644 --- a/Engine/source/materials/matInstanceHook.h +++ b/Engine/source/materials/matInstanceHook.h @@ -19,14 +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 _MATINSTANCEHOOK_H_ #define _MATINSTANCEHOOK_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif - /// The hook type wrapper object class MatInstanceHookType diff --git a/Engine/source/materials/matStateHint.h b/Engine/source/materials/matStateHint.h index 4bd65165d..b01c7b0e0 100644 --- a/Engine/source/materials/matStateHint.h +++ b/Engine/source/materials/matStateHint.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 _MATSTATEHINT_H_ #define _MATSTATEHINT_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif class ProcessedMaterial; diff --git a/Engine/source/materials/matTextureTarget.h b/Engine/source/materials/matTextureTarget.h index 594e49684..57bb277ed 100644 --- a/Engine/source/materials/matTextureTarget.h +++ b/Engine/source/materials/matTextureTarget.h @@ -19,28 +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 _MATTEXTURETARGET_H_ #define _MATTEXTURETARGET_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _REFBASE_H_ + #include "core/util/refBase.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _MRECT_H_ + #include "math/mRect.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif struct GFXShaderMacro; class ConditionerFeature; diff --git a/Engine/source/materials/materialDefinition.h b/Engine/source/materials/materialDefinition.h index abaec1583..5a9ec71ee 100644 --- a/Engine/source/materials/materialDefinition.h +++ b/Engine/source/materials/materialDefinition.h @@ -19,34 +19,26 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _MATERIALDEFINITION_H_ #define _MATERIALDEFINITION_H_ - -#ifndef _BASEMATERIALDEFINITION_H_ #include "materials/baseMaterialDefinition.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXSTRUCTS_H_ + #include "gfx/gfxStructs.h" -#endif -#ifndef _GFXCUBEMAP_H_ + #include "gfx/gfxCubemap.h" -#endif -#ifndef _DYNAMIC_CONSOLETYPES_H_ #include "console/dynamicTypes.h" -#endif #ifndef IMAGE_ASSET_H #include "T3D/assets/ImageAsset.h" #endif -#ifndef _ASSET_PTR_H_ #include "assets/assetPtr.h" -#endif + #ifndef SOUND_ASSET_H #include "T3D/assets/SoundAsset.h" #endif diff --git a/Engine/source/materials/materialFeatureData.h b/Engine/source/materials/materialFeatureData.h index 8cd22fdb5..257d1f38b 100644 --- a/Engine/source/materials/materialFeatureData.h +++ b/Engine/source/materials/materialFeatureData.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 _MATERIALFEATUREDATA_H_ #define _MATERIALFEATUREDATA_H_ - -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif -#ifndef _FEATURESET_H_ -#include "shaderGen/featureSet.h" -#endif +#include "shaderGen/featureSet.h" class ProcessedMaterial; diff --git a/Engine/source/materials/materialFeatureTypes.h b/Engine/source/materials/materialFeatureTypes.h index 5c6d5653f..229911c6e 100644 --- a/Engine/source/materials/materialFeatureTypes.h +++ b/Engine/source/materials/materialFeatureTypes.h @@ -19,14 +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 _MATERIALFEATURETYPES_H_ #define _MATERIALFEATURETYPES_H_ - -#ifndef _FEATURETYPE_H_ #include "shaderGen/featureType.h" -#endif - /// enum MaterialFeatureGroup diff --git a/Engine/source/materials/materialList.h b/Engine/source/materials/materialList.h index deb45991e..86c4aeae7 100644 --- a/Engine/source/materials/materialList.h +++ b/Engine/source/materials/materialList.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 _MATERIALLIST_H_ #define _MATERIALLIST_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ -#include "gfx/gfxTextureHandle.h" -#endif +#include "gfx/gfxTextureHandle.h" class Material; class BaseMatInstance; diff --git a/Engine/source/materials/materialManager.h b/Engine/source/materials/materialManager.h index 6d0fbdd53..8e35b09d7 100644 --- a/Engine/source/materials/materialManager.h +++ b/Engine/source/materials/materialManager.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 #ifndef _MATERIAL_MGR_H_ #define _MATERIAL_MGR_H_ - -#ifndef _MATERIALDEFINITION_H_ #include "materials/materialDefinition.h" -#endif -#ifndef _FEATURESET_H_ + #include "shaderGen/featureSet.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _TSINGLETON_H_ + #include "core/util/tSingleton.h" -#endif class SimSet; class MatInstance; diff --git a/Engine/source/materials/materialParameters.h b/Engine/source/materials/materialParameters.h index 5ad787005..6cbaf746e 100644 --- a/Engine/source/materials/materialParameters.h +++ b/Engine/source/materials/materialParameters.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 _MATERIALPARAMETERS_H_ #define _MATERIALPARAMETERS_H_ - -#ifndef _GFXSHADER_H_ #include "gfx/gfxShader.h" -#endif /// /// Similar class to GFXShaderConsts, but this is to describe generic material parameters. diff --git a/Engine/source/materials/miscShdrDat.h b/Engine/source/materials/miscShdrDat.h index d8902e552..6dbd244d1 100644 --- a/Engine/source/materials/miscShdrDat.h +++ b/Engine/source/materials/miscShdrDat.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 _MISCSHDRDAT_H_ #define _MISCSHDRDAT_H_ diff --git a/Engine/source/materials/processedCustomMaterial.h b/Engine/source/materials/processedCustomMaterial.h index 2294553bd..f2dc917bf 100644 --- a/Engine/source/materials/processedCustomMaterial.h +++ b/Engine/source/materials/processedCustomMaterial.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _MATERIALS_PROCESSEDCUSTOMMATERIAL_H_ #define _MATERIALS_PROCESSEDCUSTOMMATERIAL_H_ - -#ifndef _MATERIALS_PROCESSEDSHADERMATERIAL_H_ #include "materials/processedShaderMaterial.h" -#endif -#ifndef _CUSTOMMATERIALDEFINITION_H_ -#include "materials/customMaterialDefinition.h" -#endif +#include "materials/customMaterialDefinition.h" /// class ProcessedCustomMaterial : public ProcessedShaderMaterial diff --git a/Engine/source/materials/processedMaterial.h b/Engine/source/materials/processedMaterial.h index e93c3558d..18e447a80 100644 --- a/Engine/source/materials/processedMaterial.h +++ b/Engine/source/materials/processedMaterial.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 #ifndef _MATERIALS_PROCESSEDMATERIAL_H_ #define _MATERIALS_PROCESSEDMATERIAL_H_ - -#ifndef _MATERIALDEFINITION_H_ #include "materials/materialDefinition.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif -#ifndef _MATSTATEHINT_H_ + #include "materials/matStateHint.h" -#endif #ifndef CUSTOMSHADERBINDINGDATA_H #include "materials/customShaderBindingData.h" diff --git a/Engine/source/materials/processedShaderMaterial.h b/Engine/source/materials/processedShaderMaterial.h index 438c879e5..79dd88833 100644 --- a/Engine/source/materials/processedShaderMaterial.h +++ b/Engine/source/materials/processedShaderMaterial.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 #ifndef _MATERIALS_PROCESSEDSHADERMATERIAL_H_ #define _MATERIALS_PROCESSEDSHADERMATERIAL_H_ - -#ifndef _MATERIALS_PROCESSEDMATERIAL_H_ #include "processedMaterial.h" -#endif -#ifndef _GFXSHADER_H_ + #include "gfx/gfxShader.h" -#endif + #ifndef CUSTOMSHADERBINDINGDATA_H #include "materials/customShaderBindingData.h" #endif diff --git a/Engine/source/materials/sceneData.h b/Engine/source/materials/sceneData.h index cdaaf97e5..ab40d906a 100644 --- a/Engine/source/materials/sceneData.h +++ b/Engine/source/materials/sceneData.h @@ -19,18 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SCENEDATA_H_ #define _SCENEDATA_H_ - -#ifndef _SCENERENDERSTATE_H_ #include "scene/sceneRenderState.h" -#endif -#ifndef _LIGHTMANAGER_H_ + #include "lighting/lightManager.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif class GFXTexHandle; class GFXCubemap; diff --git a/Engine/source/materials/shaderData.h b/Engine/source/materials/shaderData.h index 2fa63271f..999b25749 100644 --- a/Engine/source/materials/shaderData.h +++ b/Engine/source/materials/shaderData.h @@ -19,18 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SHADERTDATA_H_ #define _SHADERTDATA_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _GFXSHADER_H_ + #include "gfx/gfxShader.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif class GFXShader; class ShaderData; diff --git a/Engine/source/materials/shaderMaterialParameters.h b/Engine/source/materials/shaderMaterialParameters.h index 83f068c0d..670e49abb 100644 --- a/Engine/source/materials/shaderMaterialParameters.h +++ b/Engine/source/materials/shaderMaterialParameters.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 _SHADERMATERIALPARAMETERS_H_ #define _SHADERMATERIALPARAMETERS_H_ - -#ifndef _MATERIALPARAMETERS_H_ #include "materials/materialParameters.h" -#endif -#ifndef _GFXSHADER_H_ -#include "gfx/gfxShader.h" -#endif +#include "gfx/gfxShader.h" class ShaderMaterialParameterHandle : public MaterialParameterHandle { diff --git a/Engine/source/math/mAngAxis.h b/Engine/source/math/mAngAxis.h index 02845902b..d26ba34ae 100644 --- a/Engine/source/math/mAngAxis.h +++ b/Engine/source/math/mAngAxis.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 _MANGAXIS_H_ #define _MANGAXIS_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif #ifndef USE_TEMPLATE_MATRIX class MatrixF; diff --git a/Engine/source/math/mBox.h b/Engine/source/math/mBox.h index 1cff4ccc9..ea0e4e943 100644 --- a/Engine/source/math/mBox.h +++ b/Engine/source/math/mBox.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 _MBOX_H_ #define _MBOX_H_ - -#ifndef _MBOXBASE_H_ #include "math/mBoxBase.h" -#endif -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _MPOINT2_H_ #include "math/mPoint2.h" -#endif - #ifndef USE_TEMPLATE_MATRIX class MatrixF; diff --git a/Engine/source/math/mBoxBase.h b/Engine/source/math/mBoxBase.h index 1ce8fb7dd..82cbb5ab8 100644 --- a/Engine/source/math/mBoxBase.h +++ b/Engine/source/math/mBoxBase.h @@ -19,14 +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 _MBOXBASE_H_ #define _MBOXBASE_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif - /// Base class for box geometries. class BoxBase diff --git a/Engine/source/math/mConstants.h b/Engine/source/math/mConstants.h index 6218e4040..637561152 100644 --- a/Engine/source/math/mConstants.h +++ b/Engine/source/math/mConstants.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 _MCONSTANTS_H_ #define _MCONSTANTS_H_ diff --git a/Engine/source/math/mEase.h b/Engine/source/math/mEase.h index 33dcb1467..fd0a1f831 100644 --- a/Engine/source/math/mEase.h +++ b/Engine/source/math/mEase.h @@ -36,6 +36,8 @@ http://www.robertpenner.com/profmx http://www.amazon.com/exec/obidos/ASIN/0072223561/robertpennerc-20 */ +#pragma once +#pragma once #ifndef _MEASE_H_ #define _MEASE_H_ diff --git a/Engine/source/math/mIntersector.h b/Engine/source/math/mIntersector.h index 32d8a3d6f..4d90a91b8 100644 --- a/Engine/source/math/mIntersector.h +++ b/Engine/source/math/mIntersector.h @@ -19,42 +19,26 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _MINTERSECTOR_H_ #define _MINTERSECTOR_H_ - -#ifndef _MCONSTANTS_H_ #include "math/mConstants.h" -#endif -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif -#ifndef _MORIENTEDBOX_H_ #include "math/mOrientedBox.h" -#endif -#ifndef _MSPHERE_H_ #include "math/mSphere.h" -#endif -#ifndef _MPLANE_H_ #include "math/mPlane.h" -#endif -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif -#ifndef _MPLANETRANSFORMER_H_ #include "math/mPlaneTransformer.h" -#endif -#ifndef _PROFILER_H_ #include "platform/profiler.h" -#endif - /// @file /// Precise and fast geometric intersection testing. diff --git a/Engine/source/math/mMath.h b/Engine/source/math/mMath.h index 4ddb78ac4..a377b9fd0 100644 --- a/Engine/source/math/mMath.h +++ b/Engine/source/math/mMath.h @@ -19,35 +19,27 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _MMATH_H_ #define _MMATH_H_ - - -#ifndef _MRECT_H_ #include "math/mRect.h" -#endif -#ifndef _MBOX_H_ + #include "math/mBox.h" -#endif -#ifndef _MMATRIX_H_ + #include "math/mMatrix.h" -#endif -#ifndef _MQUAT_H_ + #include "math/mQuat.h" -#endif -#ifndef _MANGAXIS_H_ + #include "math/mAngAxis.h" -#endif -#ifndef _MSPHERE_H_ + #include "math/mSphere.h" -#endif -#ifndef _MRANDOM_H_ + #include "math/mRandom.h" -#endif -#ifndef _MEASE_H_ + #include "math/mEase.h" -#endif + #ifndef MROTATION_H #include "math/mRotation.h" #endif diff --git a/Engine/source/math/mMathFn.h b/Engine/source/math/mMathFn.h index 241a9a393..a4f682456 100644 --- a/Engine/source/math/mMathFn.h +++ b/Engine/source/math/mMathFn.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 _MMATHFN_H_ #define _MMATHFN_H_ @@ -26,14 +28,9 @@ #include #include #include - -#ifndef _MCONSTANTS_H_ #include "math/mConstants.h" -#endif -#ifndef _PLATFORMASSERT_H_ -#include "platform/platformAssert.h" -#endif +#include "platform/platformAssert.h" extern void MathConsoleInit(); diff --git a/Engine/source/math/mMatrix.h b/Engine/source/math/mMatrix.h index 3b160c94c..d416e0d54 100644 --- a/Engine/source/math/mMatrix.h +++ b/Engine/source/math/mMatrix.h @@ -19,40 +19,26 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _MMATRIX_H_ #define _MMATRIX_H_ #include -#ifndef _MPLANE_H_ #include "math/mPlane.h" -#endif -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif -#ifndef _MPOINT4_H_ #include "math/mPoint4.h" -#endif -#ifndef _ENGINETYPEINFO_H_ #include "console/engineTypeInfo.h" -#endif -#ifndef _FRAMEALLOCATOR_H_ #include "core/frameAllocator.h" -#endif -#ifndef _STRINGFUNCTIONS_H_ #include "core/strings/stringFunctions.h" -#endif -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif -#ifndef _MATH_BACKEND_H_ #include "math/public/math_backend.h" -#endif #ifndef USE_TEMPLATE_MATRIX diff --git a/Engine/source/math/mOrientedBox.h b/Engine/source/math/mOrientedBox.h index 9af32874e..9a2f6c4ef 100644 --- a/Engine/source/math/mOrientedBox.h +++ b/Engine/source/math/mOrientedBox.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 _MORIENTEDBOX_H_ #define _MORIENTEDBOX_H_ - -#ifndef _MBOXBASE_H_ #include "math/mBoxBase.h" -#endif -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif - #ifndef USE_TEMPLATE_MATRIX class MatrixF; diff --git a/Engine/source/math/mPlane.h b/Engine/source/math/mPlane.h index 6191251ff..4c52a0b2a 100644 --- a/Engine/source/math/mPlane.h +++ b/Engine/source/math/mPlane.h @@ -19,26 +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 _MPLANE_H_ #define _MPLANE_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif -#ifndef _MORIENTEDBOX_H_ #include "math/mOrientedBox.h" -#endif -#ifndef _MSPHERE_H_ #include "math/mSphere.h" -#endif - /// A 3D plane defined by a normal and a distance along the normal. /// diff --git a/Engine/source/math/mPlaneSet.h b/Engine/source/math/mPlaneSet.h index 8c83b01d6..95cc7eacd 100644 --- a/Engine/source/math/mPlaneSet.h +++ b/Engine/source/math/mPlaneSet.h @@ -19,34 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _MPLANESET_H_ #define _MPLANESET_H_ - -#ifndef _MPLANE_H_ #include "math/mPlane.h" -#endif -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif -#ifndef _MSPHERE_H_ #include "math/mSphere.h" -#endif -#ifndef _MORIENTEDBOX_H_ #include "math/mOrientedBox.h" -#endif -#ifndef _TEMPALLOC_H_ #include "util/tempAlloc.h" -#endif -#ifndef _TALGORITHM_H_ #include "core/tAlgorithm.h" -#endif - /// Set of planes which can be tested against bounding volumes. /// diff --git a/Engine/source/math/mPlaneTransformer.h b/Engine/source/math/mPlaneTransformer.h index 8f1adb65a..be1d883c4 100644 --- a/Engine/source/math/mPlaneTransformer.h +++ b/Engine/source/math/mPlaneTransformer.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 _MPLANETRANSFORMER_H_ #define _MPLANETRANSFORMER_H_ - -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MPLANE_H_ + #include "math/mPlane.h" -#endif // ========================================================= class PlaneTransformer diff --git a/Engine/source/math/mPoint2.h b/Engine/source/math/mPoint2.h index 6019bf92e..10cad212e 100644 --- a/Engine/source/math/mPoint2.h +++ b/Engine/source/math/mPoint2.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 _MPOINT2_H_ #define _MPOINT2_H_ - -#ifndef _MMATHFN_H_ #include "math/mMathFn.h" -#endif //------------------------------------------------------------------------------ /// 2D integer point diff --git a/Engine/source/math/mPoint3.h b/Engine/source/math/mPoint3.h index 895454c05..c8e98b5ce 100644 --- a/Engine/source/math/mPoint3.h +++ b/Engine/source/math/mPoint3.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 +#pragma once #ifndef _MPOINT3_H_ #define _MPOINT3_H_ - -#ifndef _MMATHFN_H_ #include "math/mMathFn.h" -#endif -#ifndef _MPOINT2_H_ + #include "math/mPoint2.h" -#endif -#ifndef _MATH_BACKEND_H_ #include "math/public/math_backend.h" -#endif #include diff --git a/Engine/source/math/mPoint4.h b/Engine/source/math/mPoint4.h index 4befd326b..f3192b22f 100644 --- a/Engine/source/math/mPoint4.h +++ b/Engine/source/math/mPoint4.h @@ -19,20 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _MPOINT4_H_ #define _MPOINT4_H_ - -#ifndef _MMATHFN_H_ #include "math/mMathFn.h" -#endif -#ifndef _MPOINT3_H_ -#include "math/mPoint3.h" -#endif -#ifndef _MATH_BACKEND_H_ -#include "math/public/math_backend.h" -#endif +#include "math/mPoint3.h" +#include "math/public/math_backend.h" //------------------------------------------------------------------------------ /// 4D integer point diff --git a/Engine/source/math/mPolyhedron.h b/Engine/source/math/mPolyhedron.h index 78beaa79f..56e492184 100644 --- a/Engine/source/math/mPolyhedron.h +++ b/Engine/source/math/mPolyhedron.h @@ -19,38 +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 _MPOLYHEDRON_H_ #define _MPOLYHEDRON_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _MPLANE_H_ #include "math/mPlane.h" -#endif -#ifndef _MPLANESET_H_ #include "math/mPlaneSet.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _TUNMANAGEDVECTOR_H_ #include "core/util/tUnmanagedVector.h" -#endif -#ifndef _TFIXEDSIZEVECTOR_H_ #include "core/util/tFixedSizeVector.h" -#endif -#ifndef _MCONSTANTS_H_ #include "math/mConstants.h" -#endif - /// @file /// Templated polyhedron code to allow all code to use a central definition of polyhedrons and diff --git a/Engine/source/math/mPolyhedron.impl.h b/Engine/source/math/mPolyhedron.impl.h index bb7f199c1..a65e9572d 100644 --- a/Engine/source/math/mPolyhedron.impl.h +++ b/Engine/source/math/mPolyhedron.impl.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 _MPOLYHEDRON_IMPL_H_ #define _MPOLYHEDRON_IMPL_H_ diff --git a/Engine/source/math/mQuadPatch.h b/Engine/source/math/mQuadPatch.h index 4aa648fb3..e26943a56 100644 --- a/Engine/source/math/mQuadPatch.h +++ b/Engine/source/math/mQuadPatch.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 _MQUADPATCH_H_ #define _MQUADPATCH_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MSPLINEPATCH_H_ + #include "math/mSplinePatch.h" -#endif //------------------------------------------------------------------------------ /// Quadratic spline patch. This is a special type of spline that only had 3 control points. diff --git a/Engine/source/math/mQuat.h b/Engine/source/math/mQuat.h index 1af1a5a95..3030362a1 100644 --- a/Engine/source/math/mQuat.h +++ b/Engine/source/math/mQuat.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 _MQUAT_H_ #define _MQUAT_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif #ifndef USE_TEMPLATE_MATRIX class MatrixF; diff --git a/Engine/source/math/mRandom.h b/Engine/source/math/mRandom.h index a5c52eee1..1cf6159a4 100644 --- a/Engine/source/math/mRandom.h +++ b/Engine/source/math/mRandom.h @@ -19,14 +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 _MRANDOM_H_ #define _MRANDOM_H_ - -#ifndef _PLATFORMASSERT_H_ #include "platform/platformAssert.h" -#endif - //-------------------------------------- /// Base class for random number generators diff --git a/Engine/source/math/mRandomDeck.h b/Engine/source/math/mRandomDeck.h index 2d51f8ca6..09af223ff 100644 --- a/Engine/source/math/mRandomDeck.h +++ b/Engine/source/math/mRandomDeck.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 _MRANDOMDECK_H_ #define _MRANDOMDECK_H_ - -#ifndef _MRANDOM_H_ #include "math/mRandom.h" -#endif template class MRandomDeck diff --git a/Engine/source/math/mRandomSet.h b/Engine/source/math/mRandomSet.h index 488c430c9..ee1cf3500 100644 --- a/Engine/source/math/mRandomSet.h +++ b/Engine/source/math/mRandomSet.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 _MRANDOMSET_H_ #define _MRANDOMSET_H_ - -#ifndef _MRANDOM_H_ #include "math/mRandom.h" -#endif template class MRandomSet diff --git a/Engine/source/math/mRect.h b/Engine/source/math/mRect.h index 61985343b..15dd10a7c 100644 --- a/Engine/source/math/mRect.h +++ b/Engine/source/math/mRect.h @@ -19,14 +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 _MRECT_H_ #define _MRECT_H_ - -#ifndef _MPOINT2_H_ #include "math/mPoint2.h" -#endif - class RectI { diff --git a/Engine/source/math/mRotation.h b/Engine/source/math/mRotation.h index 0ec23f2e1..370ab1bc7 100644 --- a/Engine/source/math/mRotation.h +++ b/Engine/source/math/mRotation.h @@ -22,26 +22,15 @@ #ifndef MROTATION_H #define MROTATION_H - -#ifndef _MMATHFN_H_ #include "math/mMathFn.h" -#endif -#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 _MANGAXIS_H_ #include "math/mAngAxis.h" -#endif //------------------------------------------------------------------------------ /// Rotation Interop Utility class diff --git a/Engine/source/math/mSilhouetteExtractor.h b/Engine/source/math/mSilhouetteExtractor.h index c1ed8e869..67c22a550 100644 --- a/Engine/source/math/mSilhouetteExtractor.h +++ b/Engine/source/math/mSilhouetteExtractor.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 _MSILHOUETTEEXTRACTOR_H_ #define _MSILHOUETTEEXTRACTOR_H_ - -#ifndef _FRAMEALLOCATOR_H_ #include "core/frameAllocator.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - /// @file /// Routines for extracting silhouette polygons from polyhedrons. diff --git a/Engine/source/math/mSphere.h b/Engine/source/math/mSphere.h index 8f76dce86..13db0a3ed 100644 --- a/Engine/source/math/mSphere.h +++ b/Engine/source/math/mSphere.h @@ -19,14 +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 _MSPHERE_H_ #define _MSPHERE_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif - class SphereF { diff --git a/Engine/source/math/mSplinePatch.h b/Engine/source/math/mSplinePatch.h index 90e9cefc2..0b1124e24 100644 --- a/Engine/source/math/mSplinePatch.h +++ b/Engine/source/math/mSplinePatch.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 _MSPLINEPATCH_H_ #define _MSPLINEPATCH_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif //------------------------------------------------------------------------------ // Spline control points diff --git a/Engine/source/math/mTransform.h b/Engine/source/math/mTransform.h index 7a2716a1c..d58eba4a1 100644 --- a/Engine/source/math/mTransform.h +++ b/Engine/source/math/mTransform.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 _MTRANSFORM_H_ #define _MTRANSFORM_H_ diff --git a/Engine/source/math/mathIO.h b/Engine/source/math/mathIO.h index 23fdfe438..1c947e8d1 100644 --- a/Engine/source/math/mathIO.h +++ b/Engine/source/math/mathIO.h @@ -19,21 +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 _MATHIO_H_ #define _MATHIO_H_ //Includes -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _STREAM_H_ -#include "core/stream/stream.h" -#endif -#ifndef _MMATH_H_ -#include "math/mMath.h" -#endif +#include "core/stream/stream.h" + +#include "math/mMath.h" //------------------------------------------------------------------------------ //-------------------------------------- READING diff --git a/Engine/source/math/mathTypes.h b/Engine/source/math/mathTypes.h index 08818f685..dd0d985e4 100644 --- a/Engine/source/math/mathTypes.h +++ b/Engine/source/math/mathTypes.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 _MATHTYPES_H_ #define _MATHTYPES_H_ diff --git a/Engine/source/math/mathUtils.h b/Engine/source/math/mathUtils.h index 3787ebfeb..01f76023c 100644 --- a/Engine/source/math/mathUtils.h +++ b/Engine/source/math/mathUtils.h @@ -19,30 +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 _MATHUTILS_H_ #define _MATHUTILS_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _MRECT_H_ #include "math/mRect.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - -#ifndef _MATHUTIL_FRUSTUM_H_ #include "math/util/frustum.h" -#endif - class Box3F; class RectI; diff --git a/Engine/source/math/public/float3_dispatch.h b/Engine/source/math/public/float3_dispatch.h index e4279cb84..5174a7ab1 100644 --- a/Engine/source/math/public/float3_dispatch.h +++ b/Engine/source/math/public/float3_dispatch.h @@ -1,4 +1,5 @@ #pragma once +#pragma once #ifndef _FLOAT3_DISPATCH_H_ #define _FLOAT3_DISPATCH_H_ diff --git a/Engine/source/math/public/float4_dispatch.h b/Engine/source/math/public/float4_dispatch.h index 6f26114ce..8846415a9 100644 --- a/Engine/source/math/public/float4_dispatch.h +++ b/Engine/source/math/public/float4_dispatch.h @@ -1,4 +1,5 @@ #pragma once +#pragma once #ifndef _FLOAT4_DISPATCH_H_ #define _FLOAT4_DISPATCH_H_ diff --git a/Engine/source/math/public/mat44_dispatch.h b/Engine/source/math/public/mat44_dispatch.h index b49ef9b84..3d477388f 100644 --- a/Engine/source/math/public/mat44_dispatch.h +++ b/Engine/source/math/public/mat44_dispatch.h @@ -1,4 +1,5 @@ #pragma once +#pragma once #ifndef _MAT44_DISPATCH_H_ #define _MAT44_DISPATCH_H_ diff --git a/Engine/source/math/public/math_backend.h b/Engine/source/math/public/math_backend.h index 9c5575823..fba8e0391 100644 --- a/Engine/source/math/public/math_backend.h +++ b/Engine/source/math/public/math_backend.h @@ -1,22 +1,15 @@ #pragma once +#pragma once #ifndef _MATH_BACKEND_H_ #define _MATH_BACKEND_H_ - -#ifndef _MCONSTANTS_H_ #include "math/mConstants.h" -#endif -#ifndef _PLATFORMASSERT_H_ + #include "platform/platformAssert.h" -#endif -#ifndef _FLOAT4_DISPATCH_H_ #include "math/public/float4_dispatch.h" -#endif -#ifndef _FLOAT3_DISPATCH_H_ + #include "math/public/float3_dispatch.h" -#endif -#ifndef _MAT44_DISPATCH_H_ + #include "math/public/mat44_dispatch.h" -#endif namespace math_backend { diff --git a/Engine/source/math/util/frustum.h b/Engine/source/math/util/frustum.h index b66939270..d41bcfe4b 100644 --- a/Engine/source/math/util/frustum.h +++ b/Engine/source/math/util/frustum.h @@ -19,34 +19,21 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _MATHUTIL_FRUSTUM_H_ #define _MATHUTIL_FRUSTUM_H_ - -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif -#ifndef _MPLANE_H_ #include "math/mPlane.h" -#endif -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _MQUAT_H_ #include "math/mQuat.h" -#endif -#ifndef _MSPHERE_H_ #include "math/mSphere.h" -#endif - //TODO: Specialize intersection tests for frustums using octant tests diff --git a/Engine/source/math/util/matrixSet.h b/Engine/source/math/util/matrixSet.h index 9218a7550..65b772c75 100644 --- a/Engine/source/math/util/matrixSet.h +++ b/Engine/source/math/util/matrixSet.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 _MATRIXSET_H_ #define _MATRIXSET_H_ - -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif -#ifndef _MATRIXSETDELEGATES_H_ -#include "math/util/matrixSetDelegateMethods.h" -#endif +#include "math/util/matrixSetDelegateMethods.h" dALIGN_BEGIN diff --git a/Engine/source/math/util/matrixSetDelegateMethods.h b/Engine/source/math/util/matrixSetDelegateMethods.h index c2b375814..7c596841c 100644 --- a/Engine/source/math/util/matrixSetDelegateMethods.h +++ b/Engine/source/math/util/matrixSetDelegateMethods.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 _MATRIXSETDELEGATES_H_ #define _MATRIXSETDELEGATES_H_ diff --git a/Engine/source/math/util/quadTransforms.h b/Engine/source/math/util/quadTransforms.h index dfd0ad197..f6b8086b8 100644 --- a/Engine/source/math/util/quadTransforms.h +++ b/Engine/source/math/util/quadTransforms.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 _QUADTOQUADTRANSFORMS_H_ #define _QUADTOQUADTRANSFORMS_H_ - -#ifndef _MPOINT2_H_ #include "math/mPoint2.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MMATRIX_H_ + #include "math/mMatrix.h" -#endif // NOTE: The code in these classes originate from the Wild Magic Source Code // library by David Eberly and is used with permission. diff --git a/Engine/source/math/util/sphereMesh.h b/Engine/source/math/util/sphereMesh.h index 2f8d5df19..e37d53f0d 100644 --- a/Engine/source/math/util/sphereMesh.h +++ b/Engine/source/math/util/sphereMesh.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 _SPHEREMESH_H_ #define _SPHEREMESH_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif //------------------------------------------------------------------------------ // Class: SphereMesh diff --git a/Engine/source/math/util/tResponseCurve.h b/Engine/source/math/util/tResponseCurve.h index 896bc8632..ff9520ee6 100644 --- a/Engine/source/math/util/tResponseCurve.h +++ b/Engine/source/math/util/tResponseCurve.h @@ -23,22 +23,16 @@ // Notice: // Some of this code originates from an article in AI Game Programming Wisdom // by Dave Mark. +#pragma once +#pragma once #ifndef _TRESPONSECURVE_H_ #define _TRESPONSECURVE_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MMATHFN_H_ #include "math/mMathFn.h" -#endif -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif - // ------------------------------- // Represents a sigmoid function diff --git a/Engine/source/module/moduleCallbacks.h b/Engine/source/module/moduleCallbacks.h index e13d63cca..75a03f06c 100644 --- a/Engine/source/module/moduleCallbacks.h +++ b/Engine/source/module/moduleCallbacks.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 _MODULE_CALLBACKS_H_ #define _MODULE_CALLBACKS_H_ - -#ifndef _MODULE_DEFINITION_H #include "moduleDefinition.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/module/moduleDefinition.h b/Engine/source/module/moduleDefinition.h index 0025582eb..9e6487698 100644 --- a/Engine/source/module/moduleDefinition.h +++ b/Engine/source/module/moduleDefinition.h @@ -22,26 +22,15 @@ #ifndef _MODULE_DEFINITION_H #define _MODULE_DEFINITION_H - -#ifndef _ASSET_DEFINITION_H_ #include "assets/assetDefinition.h" -#endif -#ifndef _SIMSET_H_ #include "console/simSet.h" -#endif -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _STRINGUNIT_H_ #include "core/strings/stringUnit.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/module/moduleManager.h b/Engine/source/module/moduleManager.h index a5c351401..56ba002b0 100644 --- a/Engine/source/module/moduleManager.h +++ b/Engine/source/module/moduleManager.h @@ -22,26 +22,14 @@ #ifndef _MODULE_MANAGER_H #define _MODULE_MANAGER_H - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tvector.h" -#endif -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif - -#ifndef _MODULE_DEFINITION_H #include "moduleDefinition.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/module/moduleMergeDefinition.h b/Engine/source/module/moduleMergeDefinition.h index e706aaa4b..c50cf56f0 100644 --- a/Engine/source/module/moduleMergeDefinition.h +++ b/Engine/source/module/moduleMergeDefinition.h @@ -22,10 +22,7 @@ #ifndef _MODULE_MERGE_DEFINITION_H #define _MODULE_MERGE_DEFINITION_H - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/module/tamlModuleIdUpdateVisitor.h b/Engine/source/module/tamlModuleIdUpdateVisitor.h index 276b4548d..0ae9e7c52 100644 --- a/Engine/source/module/tamlModuleIdUpdateVisitor.h +++ b/Engine/source/module/tamlModuleIdUpdateVisitor.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_MODULE_ID_UPDATE_VISITOR_H_ #define _TAML_MODULE_ID_UPDATE_VISITOR_H_ - -#ifndef _TAML_VISITOR_H_ #include "persistence/taml/tamlVisitor.h" -#endif -#ifndef _TAML_PARSER_H_ #include "persistence/taml/tamlParser.h" -#endif -#ifndef _ASSET_FIELD_TYPES_H_ #include "assets/assetFieldTypes.h" -#endif #include "platform/profiler.h" diff --git a/Engine/source/navigation/coverPoint.h b/Engine/source/navigation/coverPoint.h index 1af45aba9..73e492995 100644 --- a/Engine/source/navigation/coverPoint.h +++ b/Engine/source/navigation/coverPoint.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 _COVERPOINT_H_ #define _COVERPOINT_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; diff --git a/Engine/source/navigation/duDebugDrawTorque.h b/Engine/source/navigation/duDebugDrawTorque.h index ba7a0c9dd..feba1bdd7 100644 --- a/Engine/source/navigation/duDebugDrawTorque.h +++ b/Engine/source/navigation/duDebugDrawTorque.h @@ -19,30 +19,20 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _DU_DEBUG_DRAW_TORQUE_H_ #define _DU_DEBUG_DRAW_TORQUE_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif + #include - -#ifndef _GFXSTATEBLOCK_H_ #include "gfx/gfxStateBlock.h" -#endif -#ifndef _GFXVERTEXTYPES_H_ #include "gfx/gfxVertexTypes.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _SCENERENDERSTATE_H_ #include "scene/sceneRenderState.h" -#endif /** * @class duDebugDrawTorque diff --git a/Engine/source/navigation/guiNavEditorCtrl.h b/Engine/source/navigation/guiNavEditorCtrl.h index c6eeea58f..5e96c7e36 100644 --- a/Engine/source/navigation/guiNavEditorCtrl.h +++ b/Engine/source/navigation/guiNavEditorCtrl.h @@ -19,20 +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 _GUINAVEDITORCTRL_H_ #define _GUINAVEDITORCTRL_H_ #include "torqueConfig.h" #ifdef TORQUE_TOOLS -#ifndef _EDITTSCTRL_H_ #include "gui/worldEditor/editTSCtrl.h" -#endif -#ifndef _UNDO_H_ + #include "util/undo.h" -#endif -#ifndef _GIZMO_H_ + #include "gui/worldEditor/gizmo.h" -#endif //#ifndef _NAVMESH_TOOL_H_ //#include "navigation/navMeshTool.h" diff --git a/Engine/source/navigation/navContext.h b/Engine/source/navigation/navContext.h index 6a507a8e7..0a960e89c 100644 --- a/Engine/source/navigation/navContext.h +++ b/Engine/source/navigation/navContext.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 _NAV_CONTEXT_H_ #define _NAV_CONTEXT_H_ diff --git a/Engine/source/navigation/navMesh.h b/Engine/source/navigation/navMesh.h index 599ee8878..2076d2513 100644 --- a/Engine/source/navigation/navMesh.h +++ b/Engine/source/navigation/navMesh.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 _NAVMESH_H_ #define _NAVMESH_H_ diff --git a/Engine/source/navigation/navMeshTool.h b/Engine/source/navigation/navMeshTool.h index ef6e9ad3c..7de546d36 100644 --- a/Engine/source/navigation/navMeshTool.h +++ b/Engine/source/navigation/navMeshTool.h @@ -1,20 +1,15 @@ #pragma once +#pragma once #ifndef _NAVMESH_TOOL_H_ #define _NAVMESH_TOOL_H_ #ifdef TORQUE_TOOLS -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _GUITYPES_H_ -#include "gui/core/guiTypes.h" -#endif -#ifndef _NAVMESH_H_ -#include "navigation/navMesh.h" -#endif -#ifndef _GUINAVEDITORCTRL_H_ +#include "gui/core/guiTypes.h" + +#include "navigation/navMesh.h" + #include "navigation/guiNavEditorCtrl.h" -#endif class UndoAction; diff --git a/Engine/source/navigation/navMeshTools/coverTool.h b/Engine/source/navigation/navMeshTools/coverTool.h index 73978a26c..14dcdbdf1 100644 --- a/Engine/source/navigation/navMeshTools/coverTool.h +++ b/Engine/source/navigation/navMeshTools/coverTool.h @@ -1,13 +1,10 @@ +#pragma once +#pragma once #ifndef _COVERTOOL_H_ #define _COVERTOOL_H_ - -#ifndef _NAVMESH_TOOL_H_ #include "navigation/navMeshTool.h" -#endif -#ifndef _NAVPATH_H_ #include "navigation/navPath.h" -#endif class CoverTool : public NavMeshTool { diff --git a/Engine/source/navigation/navMeshTools/navMeshSelectTool.h b/Engine/source/navigation/navMeshTools/navMeshSelectTool.h index 521a23fe8..cea672b5f 100644 --- a/Engine/source/navigation/navMeshTools/navMeshSelectTool.h +++ b/Engine/source/navigation/navMeshTools/navMeshSelectTool.h @@ -1,10 +1,8 @@ +#pragma once +#pragma once #ifndef _NAVMESHSELECTTOOL_H_ #define _NAVMESHSELECTTOOL_H_ - - -#ifndef _NAVMESH_TOOL_H_ #include "navigation/navMeshTool.h" -#endif class NavMeshSelectTool : public NavMeshTool { diff --git a/Engine/source/navigation/navMeshTools/navMeshTestTool.h b/Engine/source/navigation/navMeshTools/navMeshTestTool.h index 2ee56e43e..126b6a59b 100644 --- a/Engine/source/navigation/navMeshTools/navMeshTestTool.h +++ b/Engine/source/navigation/navMeshTools/navMeshTestTool.h @@ -1,14 +1,10 @@ +#pragma once +#pragma once #ifndef _NAVMESHTESTTOOL_H_ #define _NAVMESHTESTTOOL_H_ - - -#ifndef _NAVMESH_TOOL_H_ #include "navigation/navMeshTool.h" -#endif -#ifndef _NAVPATH_H_ #include "navigation/navPath.h" -#endif class NavMeshTestTool : public NavMeshTool { diff --git a/Engine/source/navigation/navMeshTools/offMeshConnTool.h b/Engine/source/navigation/navMeshTools/offMeshConnTool.h index 97b2ffa46..7f5b5c665 100644 --- a/Engine/source/navigation/navMeshTools/offMeshConnTool.h +++ b/Engine/source/navigation/navMeshTools/offMeshConnTool.h @@ -1,10 +1,8 @@ +#pragma once +#pragma once #ifndef _OFFMESHCONNTOOL_H_ #define _OFFMESHCONNTOOL_H_ - - -#ifndef _NAVMESH_TOOL_H_ #include "navigation/navMeshTool.h" -#endif class OffMeshConnectionTool : public NavMeshTool { diff --git a/Engine/source/navigation/navMeshTools/tileTool.h b/Engine/source/navigation/navMeshTools/tileTool.h index a973e7bad..3d9c2c307 100644 --- a/Engine/source/navigation/navMeshTools/tileTool.h +++ b/Engine/source/navigation/navMeshTools/tileTool.h @@ -1,10 +1,8 @@ +#pragma once +#pragma once #ifndef _TILETOOL_H_ #define _TILETOOL_H_ - - -#ifndef _NAVMESH_TOOL_H_ #include "navigation/navMeshTool.h" -#endif class TileTool : public NavMeshTool { diff --git a/Engine/source/navigation/navPath.h b/Engine/source/navigation/navPath.h index 194058b8a..b0e0795dc 100644 --- a/Engine/source/navigation/navPath.h +++ b/Engine/source/navigation/navPath.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 _NAVPATH_H_ #define _NAVPATH_H_ diff --git a/Engine/source/navigation/recastPolyList.h b/Engine/source/navigation/recastPolyList.h index 62d43ff91..994010cb0 100644 --- a/Engine/source/navigation/recastPolyList.h +++ b/Engine/source/navigation/recastPolyList.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 _RECAST_POLYLIST_H_ #define _RECAST_POLYLIST_H_ diff --git a/Engine/source/navigation/torqueRecast.h b/Engine/source/navigation/torqueRecast.h index 914de002c..196c5cc75 100644 --- a/Engine/source/navigation/torqueRecast.h +++ b/Engine/source/navigation/torqueRecast.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 _TORQUE_RECAST_H_ #define _TORQUE_RECAST_H_ diff --git a/Engine/source/persistence/taml/binary/tamlBinaryParser.h b/Engine/source/persistence/taml/binary/tamlBinaryParser.h index 6feaaee95..5b892eca4 100644 --- a/Engine/source/persistence/taml/binary/tamlBinaryParser.h +++ b/Engine/source/persistence/taml/binary/tamlBinaryParser.h @@ -1,21 +1,12 @@ #pragma once #ifndef _TAML_BINARYPARSER_H_ - -#ifndef _TAML_PARSER_H_ #include "persistence/taml/tamlParser.h" -#endif -#ifndef _TAML_VISITOR_H_ #include "persistence/taml/tamlVisitor.h" -#endif -#ifndef _STREAM_H_ #include "core/stream/stream.h" -#endif -#ifndef _FILESTREAM_H_ #include "core/stream/fileStream.h" -#endif class TamlBinaryParser : public TamlParser { diff --git a/Engine/source/persistence/taml/binary/tamlBinaryReader.h b/Engine/source/persistence/taml/binary/tamlBinaryReader.h index d6436e5da..8ef3e262d 100644 --- a/Engine/source/persistence/taml/binary/tamlBinaryReader.h +++ b/Engine/source/persistence/taml/binary/tamlBinaryReader.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_BINARYREADER_H_ #define _TAML_BINARYREADER_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/persistence/taml/binary/tamlBinaryWriter.h b/Engine/source/persistence/taml/binary/tamlBinaryWriter.h index 78fe0d4f1..253b6e94d 100644 --- a/Engine/source/persistence/taml/binary/tamlBinaryWriter.h +++ b/Engine/source/persistence/taml/binary/tamlBinaryWriter.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 _TAML_BINARYWRITER_H_ #define _TAML_BINARYWRITER_H_ - -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/persistence/taml/fsTinyXml.h b/Engine/source/persistence/taml/fsTinyXml.h index 8c99b0e5d..d31e82d95 100644 --- a/Engine/source/persistence/taml/fsTinyXml.h +++ b/Engine/source/persistence/taml/fsTinyXml.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 _FSTINYXML_H_ #define _FSTINYXML_H_ @@ -29,10 +31,7 @@ #endif #include "platform/platform.h" - -#ifndef _FILESTREAM_H_ #include "core/stream/fileStream.h" -#endif class VfsXMLPrinter : public tinyxml2::XMLPrinter { diff --git a/Engine/source/persistence/taml/json/tamlJSONParser.h b/Engine/source/persistence/taml/json/tamlJSONParser.h index 6ef9c1020..b5f71c7a4 100644 --- a/Engine/source/persistence/taml/json/tamlJSONParser.h +++ b/Engine/source/persistence/taml/json/tamlJSONParser.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 _TAML_JSONPARSER_H_ #define _TAML_JSONPARSER_H_ - -#ifndef _TAML_PARSER_H_ #include "persistence/taml/tamlParser.h" -#endif /// RapidJson. #include "persistence/rapidjson/document.h" diff --git a/Engine/source/persistence/taml/json/tamlJSONReader.h b/Engine/source/persistence/taml/json/tamlJSONReader.h index 715c2c5b5..ede173e32 100644 --- a/Engine/source/persistence/taml/json/tamlJSONReader.h +++ b/Engine/source/persistence/taml/json/tamlJSONReader.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_JSONREADER_H_ #define _TAML_JSONREADER_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif /// RapidJson. #include "persistence/rapidjson/document.h" diff --git a/Engine/source/persistence/taml/json/tamlJSONWriter.h b/Engine/source/persistence/taml/json/tamlJSONWriter.h index f5c180dc3..6a47b5beb 100644 --- a/Engine/source/persistence/taml/json/tamlJSONWriter.h +++ b/Engine/source/persistence/taml/json/tamlJSONWriter.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 _TAML_JSONWRITER_H_ #define _TAML_JSONWRITER_H_ - -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif /// RapidJson. #include "persistence/rapidjson/document.h" diff --git a/Engine/source/persistence/taml/taml.h b/Engine/source/persistence/taml/taml.h index dd093e164..5b27e9279 100644 --- a/Engine/source/persistence/taml/taml.h +++ b/Engine/source/persistence/taml/taml.h @@ -19,41 +19,26 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _TAML_H_ #define _TAML_H_ - -#ifndef _TAML_CALLBACKS_H_ #include "persistence/taml/tamlCallbacks.h" -#endif -#ifndef _TAML_CUSTOM_H_ #include "persistence/taml/tamlCustom.h" -#endif -#ifndef _TAML_CHILDREN_H_ #include "persistence/taml/tamlChildren.h" -#endif -#ifndef _TAML_WRITE_NODE_H_ #include "persistence/taml/tamlWriteNode.h" -#endif -#ifndef _TAML_VISITOR_H_ #include "persistence/taml/tamlVisitor.h" -#endif -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _FILESTREAM_H_ #include "core/stream/fileStream.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/persistence/taml/tamlCallbacks.h b/Engine/source/persistence/taml/tamlCallbacks.h index 31bebab1d..d81fa0c3c 100644 --- a/Engine/source/persistence/taml/tamlCallbacks.h +++ b/Engine/source/persistence/taml/tamlCallbacks.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 _TAML_CALLBACKS_H_ #define _TAML_CALLBACKS_H_ diff --git a/Engine/source/persistence/taml/tamlChildren.h b/Engine/source/persistence/taml/tamlChildren.h index bc277aa0f..deb5d3511 100644 --- a/Engine/source/persistence/taml/tamlChildren.h +++ b/Engine/source/persistence/taml/tamlChildren.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 _TAML_CHILDREN_H_ #define _TAML_CHILDREN_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/persistence/taml/tamlCustom.h b/Engine/source/persistence/taml/tamlCustom.h index fc83ad46d..d1306c68e 100644 --- a/Engine/source/persistence/taml/tamlCustom.h +++ b/Engine/source/persistence/taml/tamlCustom.h @@ -19,38 +19,25 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_CUSTOM_H_ #define _TAML_CUSTOM_H_ - -#ifndef _FACTORY_CACHE_H_ #include "core/factoryCache.h" -#endif -#ifndef _STRINGTABLE_H_ #include "core/stringTable.h" -#endif -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif -#ifndef _CONSOLETYPES_H_ #include "console/consoleTypes.h" -#endif #ifndef B2_MATH_H //TODO: Look at this //#include "box2d/Common/b2Math.h" #endif - -#ifndef _COLOR_H_ #include "core/color.h" -#endif -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif #include "core/util/safeDelete.h" diff --git a/Engine/source/persistence/taml/tamlParser.h b/Engine/source/persistence/taml/tamlParser.h index 955dcb942..e29f5570e 100644 --- a/Engine/source/persistence/taml/tamlParser.h +++ b/Engine/source/persistence/taml/tamlParser.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 _TAML_PARSER_H_ #define _TAML_PARSER_H_ diff --git a/Engine/source/persistence/taml/tamlVisitor.h b/Engine/source/persistence/taml/tamlVisitor.h index ac80ccf76..4a099893e 100644 --- a/Engine/source/persistence/taml/tamlVisitor.h +++ b/Engine/source/persistence/taml/tamlVisitor.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 _TAML_VISITOR_H_ #define _TAML_VISITOR_H_ diff --git a/Engine/source/persistence/taml/tamlWriteNode.h b/Engine/source/persistence/taml/tamlWriteNode.h index b406a54d8..f5eaa4ed3 100644 --- a/Engine/source/persistence/taml/tamlWriteNode.h +++ b/Engine/source/persistence/taml/tamlWriteNode.h @@ -19,21 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_WRITE_NODE_H_ #define _TAML_WRITE_NODE_H_ - -#ifndef _TAML_CUSTOM_H_ #include "persistence/taml/tamlCustom.h" -#endif -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _VECTOR_H_ #include "core/util/tVector.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/persistence/taml/xml/tamlXmlParser.h b/Engine/source/persistence/taml/xml/tamlXmlParser.h index 62e637276..aa167901f 100644 --- a/Engine/source/persistence/taml/xml/tamlXmlParser.h +++ b/Engine/source/persistence/taml/xml/tamlXmlParser.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 _TAML_XMLPARSER_H_ #define _TAML_XMLPARSER_H_ - -#ifndef _TAML_PARSER_H_ #include "persistence/taml/tamlParser.h" -#endif #ifndef TINYXML2_INCLUDED #include diff --git a/Engine/source/persistence/taml/xml/tamlXmlReader.h b/Engine/source/persistence/taml/xml/tamlXmlReader.h index 77bed4fd6..ba1a9e3d4 100644 --- a/Engine/source/persistence/taml/xml/tamlXmlReader.h +++ b/Engine/source/persistence/taml/xml/tamlXmlReader.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TAML_XMLREADER_H_ #define _TAML_XMLREADER_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/persistence/taml/xml/tamlXmlWriter.h b/Engine/source/persistence/taml/xml/tamlXmlWriter.h index 7016909e2..ef061e68a 100644 --- a/Engine/source/persistence/taml/xml/tamlXmlWriter.h +++ b/Engine/source/persistence/taml/xml/tamlXmlWriter.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 _TAML_XMLWRITER_H_ #define _TAML_XMLWRITER_H_ - -#ifndef _TAML_H_ #include "persistence/taml/taml.h" -#endif //----------------------------------------------------------------------------- diff --git a/Engine/source/platform/async/asyncBufferedStream.h b/Engine/source/platform/async/asyncBufferedStream.h index 8c421c5c9..ec221f589 100644 --- a/Engine/source/platform/async/asyncBufferedStream.h +++ b/Engine/source/platform/async/asyncBufferedStream.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 _ASYNCBUFFEREDSTREAM_H_ #define _ASYNCBUFFEREDSTREAM_H_ diff --git a/Engine/source/platform/async/asyncPacketQueue.h b/Engine/source/platform/async/asyncPacketQueue.h index 3bf36e9a5..706c02345 100644 --- a/Engine/source/platform/async/asyncPacketQueue.h +++ b/Engine/source/platform/async/asyncPacketQueue.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 _ASYNCPACKETQUEUE_H_ #define _ASYNCPACKETQUEUE_H_ - -#ifndef _TFIXEDSIZEQUEUE_H_ #include "core/util/tFixedSizeDeque.h" -#endif -#ifndef _TSTREAM_H_ #include "core/stream/tStream.h" -#endif -#ifndef _TYPETRAITS_H_ #include "platform/typetraits.h" -#endif - //#define DEBUG_SPEW diff --git a/Engine/source/platform/async/asyncPacketStream.h b/Engine/source/platform/async/asyncPacketStream.h index 374118784..ce1282e1e 100644 --- a/Engine/source/platform/async/asyncPacketStream.h +++ b/Engine/source/platform/async/asyncPacketStream.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 _ASYNCPACKETSTREAM_H_ #define _ASYNCPACKETSTREAM_H_ diff --git a/Engine/source/platform/async/asyncUpdate.h b/Engine/source/platform/async/asyncUpdate.h index e158ddaed..b68d6ad2a 100644 --- a/Engine/source/platform/async/asyncUpdate.h +++ b/Engine/source/platform/async/asyncUpdate.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 _ASYNCUPDATE_H_ #define _ASYNCUPDATE_H_ diff --git a/Engine/source/platform/input/IInputDevice.h b/Engine/source/platform/input/IInputDevice.h index bef65ae99..04ce31a9d 100644 --- a/Engine/source/platform/input/IInputDevice.h +++ b/Engine/source/platform/input/IInputDevice.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 _IINPUTDEVICE_H_ #define _IINPUTDEVICE_H_ diff --git a/Engine/source/platform/input/IProcessInput.h b/Engine/source/platform/input/IProcessInput.h index 9e639f71c..d7437f9d1 100644 --- a/Engine/source/platform/input/IProcessInput.h +++ b/Engine/source/platform/input/IProcessInput.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 _I_PROCESSINPUT_H_ #define _I_PROCESSINPUT_H_ diff --git a/Engine/source/platform/input/event.h b/Engine/source/platform/input/event.h index a63d0d62c..e42c58033 100644 --- a/Engine/source/platform/input/event.h +++ b/Engine/source/platform/input/event.h @@ -26,6 +26,8 @@ /// in this file. /// +#pragma once +#pragma once #ifndef _EVENT_H_ #define _EVENT_H_ diff --git a/Engine/source/platform/nativeDialogs/fileDialog.h b/Engine/source/platform/nativeDialogs/fileDialog.h index 7c08b51ae..b256cf35a 100644 --- a/Engine/source/platform/nativeDialogs/fileDialog.h +++ b/Engine/source/platform/nativeDialogs/fileDialog.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 _FILEDIALOG_H_ #define _FILEDIALOG_H_ #include "console/simBase.h" diff --git a/Engine/source/platform/nativeDialogs/msgBox.h b/Engine/source/platform/nativeDialogs/msgBox.h index 4c81e7715..9c9f38739 100644 --- a/Engine/source/platform/nativeDialogs/msgBox.h +++ b/Engine/source/platform/nativeDialogs/msgBox.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 _MSGBOX_H_ #define _MSGBOX_H_ diff --git a/Engine/source/platform/output/IDisplayDevice.h b/Engine/source/platform/output/IDisplayDevice.h index 075d0acaa..8c4f7bd27 100644 --- a/Engine/source/platform/output/IDisplayDevice.h +++ b/Engine/source/platform/output/IDisplayDevice.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 _IDISPLAYDEVICE_H_ #define _IDISPLAYDEVICE_H_ diff --git a/Engine/source/platform/platform.h b/Engine/source/platform/platform.h index 0d377f23f..c61136eaf 100644 --- a/Engine/source/platform/platform.h +++ b/Engine/source/platform/platform.h @@ -19,33 +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 _PLATFORM_H_ #define _PLATFORM_H_ #include - -#ifndef _TORQUECONFIG_H_ #include "torqueConfig.h" -#endif -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif -#ifndef _PLATFORMASSERT_H_ + #include "platform/platformAssert.h" -#endif -#ifndef _MSGBOX_H_ + #include "platform/nativeDialogs/msgBox.h" -#endif -#ifndef _VERSION_H_ + #include "app/version.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif -#ifndef _TORQUE_SAFEDELETE_H_ + #include "core/util/safeDelete.h" -#endif #include #include diff --git a/Engine/source/platform/platformAssert.h b/Engine/source/platform/platformAssert.h index 86ccb1b23..d83ba86dc 100644 --- a/Engine/source/platform/platformAssert.h +++ b/Engine/source/platform/platformAssert.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 _PLATFORMASSERT_H_ #define _PLATFORMASSERT_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif class PlatformAssert { diff --git a/Engine/source/platform/platformCPUCount.h b/Engine/source/platform/platformCPUCount.h index 66a0c2e12..aef7bccf7 100644 --- a/Engine/source/platform/platformCPUCount.h +++ b/Engine/source/platform/platformCPUCount.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 _TORQUE_PLATFORM_PLATFORMCPUCOUNT_H_ #define _TORQUE_PLATFORM_PLATFORMCPUCOUNT_H_ diff --git a/Engine/source/platform/platformFont.h b/Engine/source/platform/platformFont.h index 63a47d95a..e0c272b29 100644 --- a/Engine/source/platform/platformFont.h +++ b/Engine/source/platform/platformFont.h @@ -19,10 +19,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif + +#pragma once +#pragma once #ifndef _PLATFORMFONT_H_ #define _PLATFORMFONT_H_ diff --git a/Engine/source/platform/platformInput.h b/Engine/source/platform/platformInput.h index 4faf3830c..67465bcb8 100644 --- a/Engine/source/platform/platformInput.h +++ b/Engine/source/platform/platformInput.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 _PLATFORMINPUT_H_ #define _PLATFORMINPUT_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif #include "platform/input/event.h" diff --git a/Engine/source/platform/platformIntrinsics.gcc.h b/Engine/source/platform/platformIntrinsics.gcc.h index f846126db..c394c2167 100644 --- a/Engine/source/platform/platformIntrinsics.gcc.h +++ b/Engine/source/platform/platformIntrinsics.gcc.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 _TORQUE_PLATFORM_PLATFORMINTRINSICS_GCC_H_ #define _TORQUE_PLATFORM_PLATFORMINTRINSICS_GCC_H_ diff --git a/Engine/source/platform/platformIntrinsics.h b/Engine/source/platform/platformIntrinsics.h index c480242a2..f658a886c 100644 --- a/Engine/source/platform/platformIntrinsics.h +++ b/Engine/source/platform/platformIntrinsics.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 _PLATFORMINTRINSICS_H_ #define _PLATFORMINTRINSICS_H_ diff --git a/Engine/source/platform/platformIntrinsics.visualc.h b/Engine/source/platform/platformIntrinsics.visualc.h index e3d39f991..d2892a2b6 100644 --- a/Engine/source/platform/platformIntrinsics.visualc.h +++ b/Engine/source/platform/platformIntrinsics.visualc.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 _TORQUE_PLATFORM_PLATFORMINTRINSICS_VISUALC_H_ #define _TORQUE_PLATFORM_PLATFORMINTRINSICS_VISUALC_H_ diff --git a/Engine/source/platform/platformMemory.h b/Engine/source/platform/platformMemory.h index c9b74c750..7ad7717dd 100644 --- a/Engine/source/platform/platformMemory.h +++ b/Engine/source/platform/platformMemory.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 _TORQUE_PLATFORM_PLATFORMMEMORY_H_ #define _TORQUE_PLATFORM_PLATFORMMEMORY_H_ diff --git a/Engine/source/platform/platformNet.h b/Engine/source/platform/platformNet.h index c07c2d9f6..30e0e7e9b 100644 --- a/Engine/source/platform/platformNet.h +++ b/Engine/source/platform/platformNet.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 _PLATFORM_PLATFORMNET_H_ #define _PLATFORM_PLATFORMNET_H_ diff --git a/Engine/source/platform/platformRedBook.h b/Engine/source/platform/platformRedBook.h index 49e393c89..9e82ead4a 100644 --- a/Engine/source/platform/platformRedBook.h +++ b/Engine/source/platform/platformRedBook.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 _PLATFORMREDBOOK_H_ #define _PLATFORMREDBOOK_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif class RedBookDevice { diff --git a/Engine/source/platform/platformTLS.h b/Engine/source/platform/platformTLS.h index 69308ca45..a5b9e736e 100644 --- a/Engine/source/platform/platformTLS.h +++ b/Engine/source/platform/platformTLS.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 _PLATFORMTLS_H_ #define _PLATFORMTLS_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif struct PlatformThreadStorage; diff --git a/Engine/source/platform/platformTimer.h b/Engine/source/platform/platformTimer.h index 84807f1d7..bc4656bc3 100644 --- a/Engine/source/platform/platformTimer.h +++ b/Engine/source/platform/platformTimer.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 _PLATFORM_PLATFORMTIMER_H_ #define _PLATFORM_PLATFORMTIMER_H_ diff --git a/Engine/source/platform/platformVFS.h b/Engine/source/platform/platformVFS.h index 6c2877aee..8229a022b 100644 --- a/Engine/source/platform/platformVFS.h +++ b/Engine/source/platform/platformVFS.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 _PLATFORMVFS_H_ #define _PLATFORMVFS_H_ diff --git a/Engine/source/platform/platformVideoInfo.h b/Engine/source/platform/platformVideoInfo.h index 8ac67ad02..389278698 100644 --- a/Engine/source/platform/platformVideoInfo.h +++ b/Engine/source/platform/platformVideoInfo.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 _PLATFORM_VIDEOINFO_H_ #define _PLATFORM_VIDEOINFO_H_ diff --git a/Engine/source/platform/platformVolume.h b/Engine/source/platform/platformVolume.h index 8fe6c8b56..a503aa330 100644 --- a/Engine/source/platform/platformVolume.h +++ b/Engine/source/platform/platformVolume.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 _PLATFORMVOLUME_H_ #define _PLATFORMVOLUME_H_ diff --git a/Engine/source/platform/profiler.h b/Engine/source/platform/profiler.h index 91325ad58..91e5fbe26 100644 --- a/Engine/source/platform/profiler.h +++ b/Engine/source/platform/profiler.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 _PROFILER_H_ #define _PROFILER_H_ - -#ifndef _TORQUECONFIG_H_ #include "torqueConfig.h" -#endif #ifdef TORQUE_ENABLE_PROFILER diff --git a/Engine/source/platform/threads/mutex.h b/Engine/source/platform/threads/mutex.h index 3fecb423a..f09d4d438 100644 --- a/Engine/source/platform/threads/mutex.h +++ b/Engine/source/platform/threads/mutex.h @@ -22,6 +22,7 @@ #include "platform/types.h" #include "platform/platformAssert.h" +#pragma once #ifndef _PLATFORM_THREADS_MUTEX_H_ #define _PLATFORM_THREADS_MUTEX_H_ diff --git a/Engine/source/platform/threads/semaphore.h b/Engine/source/platform/threads/semaphore.h index 2da23f44e..752adfa03 100644 --- a/Engine/source/platform/threads/semaphore.h +++ b/Engine/source/platform/threads/semaphore.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 _PLATFORM_THREAD_SEMAPHORE_H_ #define _PLATFORM_THREAD_SEMAPHORE_H_ - -#ifndef _TORQUE_TYPES_H_ #include "platform/types.h" -#endif // Forward ref used by platform code class PlatformSemaphore; diff --git a/Engine/source/platform/threads/thread.h b/Engine/source/platform/threads/thread.h index 9d4b9259c..a42e21090 100644 --- a/Engine/source/platform/threads/thread.h +++ b/Engine/source/platform/threads/thread.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 _PLATFORM_THREADS_THREAD_H_ #define _PLATFORM_THREADS_THREAD_H_ diff --git a/Engine/source/platform/threads/threadPool.h b/Engine/source/platform/threads/threadPool.h index 5fb8cc60b..6e3ba344a 100644 --- a/Engine/source/platform/threads/threadPool.h +++ b/Engine/source/platform/threads/threadPool.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 _THREADPOOL_H_ #define _THREADPOOL_H_ diff --git a/Engine/source/platform/threads/threadPoolAsyncIO.h b/Engine/source/platform/threads/threadPoolAsyncIO.h index 35738d091..22576d1f5 100644 --- a/Engine/source/platform/threads/threadPoolAsyncIO.h +++ b/Engine/source/platform/threads/threadPoolAsyncIO.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 _THREADPOOLASYNCIO_H_ #define _THREADPOOLASYNCIO_H_ diff --git a/Engine/source/platform/threads/threadSafeDeque.h b/Engine/source/platform/threads/threadSafeDeque.h index 795511a20..a73c3d689 100644 --- a/Engine/source/platform/threads/threadSafeDeque.h +++ b/Engine/source/platform/threads/threadSafeDeque.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 _THREADSAFEDEQUE_H_ #define _THREADSAFEDEQUE_H_ diff --git a/Engine/source/platform/threads/threadSafeFreeList.h b/Engine/source/platform/threads/threadSafeFreeList.h index c657b9847..fddd49a4f 100644 --- a/Engine/source/platform/threads/threadSafeFreeList.h +++ b/Engine/source/platform/threads/threadSafeFreeList.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 _THREADSAFEFREELIST_H_ #define _THREADSAFEFREELIST_H_ diff --git a/Engine/source/platform/threads/threadSafePriorityQueue.h b/Engine/source/platform/threads/threadSafePriorityQueue.h index 8f6c382b8..9be1a453e 100644 --- a/Engine/source/platform/threads/threadSafePriorityQueue.h +++ b/Engine/source/platform/threads/threadSafePriorityQueue.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 _THREADSAFEPRIORITYQUEUE_H_ #define _THREADSAFEPRIORITYQUEUE_H_ diff --git a/Engine/source/platform/threads/threadSafeRefCount.h b/Engine/source/platform/threads/threadSafeRefCount.h index 96e11aa20..62bd60312 100644 --- a/Engine/source/platform/threads/threadSafeRefCount.h +++ b/Engine/source/platform/threads/threadSafeRefCount.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 _THREADSAFEREFCOUNT_H_ #define _THREADSAFEREFCOUNT_H_ diff --git a/Engine/source/platform/types.h b/Engine/source/platform/types.h index 669659b92..d0473e95f 100644 --- a/Engine/source/platform/types.h +++ b/Engine/source/platform/types.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 _TORQUE_TYPES_H_ #define _TORQUE_TYPES_H_ diff --git a/Engine/source/platform/types.mac.h b/Engine/source/platform/types.mac.h index fb31d5ea7..58474f504 100644 --- a/Engine/source/platform/types.mac.h +++ b/Engine/source/platform/types.mac.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 _TYPESPPC_H_ #define _TYPESPPC_H_ diff --git a/Engine/source/platform/types.posix.h b/Engine/source/platform/types.posix.h index 37bfc41d7..acf2f8295 100644 --- a/Engine/source/platform/types.posix.h +++ b/Engine/source/platform/types.posix.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 _TYPESPOSIX_H_ #define _TYPESPOSIX_H_ diff --git a/Engine/source/platform/types.ppc.h b/Engine/source/platform/types.ppc.h index c28f70a60..1b7d54633 100644 --- a/Engine/source/platform/types.ppc.h +++ b/Engine/source/platform/types.ppc.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 _TYPESPPC_H_ #define _TYPESPPC_H_ diff --git a/Engine/source/platform/types.win.h b/Engine/source/platform/types.win.h index 68e0e3a63..5ab2af840 100644 --- a/Engine/source/platform/types.win.h +++ b/Engine/source/platform/types.win.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 _TYPESWIN32_H_ #define _TYPESWIN32_H_ diff --git a/Engine/source/platform/typesLinux.h b/Engine/source/platform/typesLinux.h index 0acb698b9..e04df90ab 100644 --- a/Engine/source/platform/typesLinux.h +++ b/Engine/source/platform/typesLinux.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 _TYPESLINUX_H_ #define _TYPESLINUX_H_ diff --git a/Engine/source/platform/typesWin32.h b/Engine/source/platform/typesWin32.h index 8d96b3bfb..cdaa409c0 100644 --- a/Engine/source/platform/typesWin32.h +++ b/Engine/source/platform/typesWin32.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 _TYPESWIN32_H_ #define _TYPESWIN32_H_ diff --git a/Engine/source/platform/typesX86UNIX.h b/Engine/source/platform/typesX86UNIX.h index a9b4ab31e..ae9ea6689 100644 --- a/Engine/source/platform/typesX86UNIX.h +++ b/Engine/source/platform/typesX86UNIX.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 _TYPESX86UNIX_H_ #define _TYPESX86UNIX_H_ diff --git a/Engine/source/platform/typetraits.h b/Engine/source/platform/typetraits.h index 658fdaa83..a8ccb3864 100644 --- a/Engine/source/platform/typetraits.h +++ b/Engine/source/platform/typetraits.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 _TYPETRAITS_H_ #define _TYPETRAITS_H_ diff --git a/Engine/source/platformSDL/sdlInputManager.h b/Engine/source/platformSDL/sdlInputManager.h index 5bea81a9e..21d3f9d2d 100644 --- a/Engine/source/platformSDL/sdlInputManager.h +++ b/Engine/source/platformSDL/sdlInputManager.h @@ -19,13 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SDLINPUTMANAGER_H_ #define _SDLINPUTMANAGER_H_ - -#ifndef _PLATFORMINPUT_H_ #include "platform/platformInput.h" -#endif + #include "SDL.h" //------------------------------------------------------------------------------ diff --git a/Engine/source/platformWin32/platformWin32.h b/Engine/source/platformWin32/platformWin32.h index ba29ee334..ba239f8f8 100644 --- a/Engine/source/platformWin32/platformWin32.h +++ b/Engine/source/platformWin32/platformWin32.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 _PLATFORMWIN32_H_ #define _PLATFORMWIN32_H_ @@ -31,12 +32,9 @@ #endif #include -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MRECT_H_ + #include "math/mRect.h" -#endif #if defined(TORQUE_COMPILER_CODEWARRIOR) # include @@ -51,8 +49,6 @@ #pragma warning(disable: 4996) // turn off "deprecation" warnings #endif -#define NOMINMAX - // Hack to get a correct HWND instead of using global state. extern HWND getWin32WindowHandle(); diff --git a/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h b/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h index 72d1c6400..e49c22dc7 100644 --- a/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h +++ b/Engine/source/platformWin32/videoInfo/wmiVideoInfo.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 _WMI_CARDINFO_H_ #define _WMI_CARDINFO_H_ diff --git a/Engine/source/platformWin32/winConsole.h b/Engine/source/platformWin32/winConsole.h index 355167042..88b247af9 100644 --- a/Engine/source/platformWin32/winConsole.h +++ b/Engine/source/platformWin32/winConsole.h @@ -19,14 +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 _WINCONSOLE_H_ #define _WINCONSOLE_H_ #define MAX_CMDS 10 -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif class WinConsole { diff --git a/Engine/source/platformWin32/winDInputDevice.cpp b/Engine/source/platformWin32/winDInputDevice.cpp index 99fb32a3b..b7264034b 100644 --- a/Engine/source/platformWin32/winDInputDevice.cpp +++ b/Engine/source/platformWin32/winDInputDevice.cpp @@ -1089,8 +1089,8 @@ void DInputDevice::rumble(F32 x, F32 y) } // Clamp the input floats to [0 - 1] - x = max(0, min(1, x)); - y = max(0, min(1, y)); + x = getMax(0.0f, getMin(1.0f, x)); + y = getMax(0.0f, getMin(1.0f, y)); if ( 1 == mNumForceFeedbackAxes ) { diff --git a/Engine/source/platformWin32/winDInputDevice.h b/Engine/source/platformWin32/winDInputDevice.h index 3f92dfea9..6512a8a69 100644 --- a/Engine/source/platformWin32/winDInputDevice.h +++ b/Engine/source/platformWin32/winDInputDevice.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 _WINDINPUTDEVICE_H_ #define _WINDINPUTDEVICE_H_ - -#ifndef _PLATFORMWIN32_H_ #include "platformWin32/platformWin32.h" -#endif -#ifndef _PLATFORMINPUT_H_ + #include "platform/platformInput.h" -#endif #define DIRECTINPUT_VERSION 0x0800 #include diff --git a/Engine/source/platformWin32/winDirectInput.h b/Engine/source/platformWin32/winDirectInput.h index 9f5d86ac0..4912964a2 100644 --- a/Engine/source/platformWin32/winDirectInput.h +++ b/Engine/source/platformWin32/winDirectInput.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 _WINDIRECTINPUT_H_ #define _WINDIRECTINPUT_H_ - -#ifndef _PLATFORMWIN32_H_ #include "platformWin32/platformWin32.h" -#endif -#ifndef _PLATFORMINPUT_H_ + #include "platform/platformInput.h" -#endif -#ifndef _WINDINPUTDEVICE_H_ + #include "platformWin32/winDInputDevice.h" -#endif #define DIRECTINPUT_VERSION 0x0800 #include diff --git a/Engine/source/platformWin32/winDlibrary.cpp b/Engine/source/platformWin32/winDlibrary.cpp index 5b937bd2f..339cd6c12 100644 --- a/Engine/source/platformWin32/winDlibrary.cpp +++ b/Engine/source/platformWin32/winDlibrary.cpp @@ -20,8 +20,6 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN #include #include "platform/types.h" diff --git a/Engine/source/platformWin32/winExec.cpp b/Engine/source/platformWin32/winExec.cpp index a4c08c88d..589536de5 100644 --- a/Engine/source/platformWin32/winExec.cpp +++ b/Engine/source/platformWin32/winExec.cpp @@ -30,6 +30,8 @@ #include "core/util/safeDelete.h" #include "util/tempAlloc.h" +#include + //----------------------------------------------------------------------------- // Thread for executing in //----------------------------------------------------------------------------- diff --git a/Engine/source/platformWin32/winFont.h b/Engine/source/platformWin32/winFont.h index b5a980705..c8c637974 100644 --- a/Engine/source/platformWin32/winFont.h +++ b/Engine/source/platformWin32/winFont.h @@ -19,10 +19,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _PLATFORMFONT_H_ #include "platform/platformFont.h" -#endif + +#pragma once +#pragma once #ifndef _WINFONT_H_ #define _WINFONT_H_ diff --git a/Engine/source/platformWin32/winTimer.cpp b/Engine/source/platformWin32/winTimer.cpp index 74bd4b0e3..89c3a71e2 100644 --- a/Engine/source/platformWin32/winTimer.cpp +++ b/Engine/source/platformWin32/winTimer.cpp @@ -21,7 +21,6 @@ //----------------------------------------------------------------------------- // Grab the win32 headers so we can access QPC -#define WIN32_LEAN_AND_MEAN #include #include "platform/platformTimer.h" diff --git a/Engine/source/platformWin32/winVolume.h b/Engine/source/platformWin32/winVolume.h index feda42281..b492b2475 100644 --- a/Engine/source/platformWin32/winVolume.h +++ b/Engine/source/platformWin32/winVolume.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 _WINVOLUME_H_ #define _WINVOLUME_H_ - -#ifndef _VOLUME_H_ #include "core/volume.h" -#endif namespace Torque { diff --git a/Engine/source/postFx/postEffect.h b/Engine/source/postFx/postEffect.h index 101f171dc..7148bd7e2 100644 --- a/Engine/source/postFx/postEffect.h +++ b/Engine/source/postFx/postEffect.h @@ -19,46 +19,33 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _POST_EFFECT_H_ #define _POST_EFFECT_H_ - -#ifndef _SIMSET_H_ #include "console/simSet.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MPOINT2_H_ + #include "math/mPoint2.h" -#endif -#ifndef _GFXSHADER_H_ + #include "gfx/gfxShader.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ + #include "gfx/gfxStateBlock.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXCUBEMAP_H_ + #include "gfx/gfxCubemap.h" -#endif -#ifndef _GFXTARGET_H_ + #include "gfx/gfxTarget.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _POSTEFFECTCOMMON_H_ + #include "postFx/postEffectCommon.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif #include "T3D/assets/ImageAsset.h" diff --git a/Engine/source/postFx/postEffectCommon.h b/Engine/source/postFx/postEffectCommon.h index d99800295..3e356631d 100644 --- a/Engine/source/postFx/postEffectCommon.h +++ b/Engine/source/postFx/postEffectCommon.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 _POSTEFFECTCOMMON_H_ #define _POSTEFFECTCOMMON_H_ diff --git a/Engine/source/postFx/postEffectManager.h b/Engine/source/postFx/postEffectManager.h index e8c55c0d7..2fd855a0e 100644 --- a/Engine/source/postFx/postEffectManager.h +++ b/Engine/source/postFx/postEffectManager.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 _POSTEFFECTMANAGER_H_ #define _POSTEFFECTMANAGER_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif -#ifndef _TSINGLETON_H_ + #include "core/util/tSingleton.h" -#endif -#ifndef _POSTEFFECTCOMMON_H_ + #include "postFx/postEffectCommon.h" -#endif class PostEffect; class RenderBinManager; diff --git a/Engine/source/postFx/postEffectVis.h b/Engine/source/postFx/postEffectVis.h index 0ef807a58..77813bc35 100644 --- a/Engine/source/postFx/postEffectVis.h +++ b/Engine/source/postFx/postEffectVis.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _POSTEFFECTVIS_H_ #define _POSTEFFECTVIS_H_ - -#ifndef _TSINGLETON_H_ #include "core/util/tSingleton.h" -#endif - -#ifndef _POST_EFFECT_H_ #include "postFx/postEffect.h" -#endif class GuiWindowCtrl; class GuiBitmapCtrl; diff --git a/Engine/source/renderInstance/forcedMaterialMeshMgr.h b/Engine/source/renderInstance/forcedMaterialMeshMgr.h index 637de4b68..991ff3d5c 100644 --- a/Engine/source/renderInstance/forcedMaterialMeshMgr.h +++ b/Engine/source/renderInstance/forcedMaterialMeshMgr.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 _RENDERFORCEDMATMESHMGR_H_ #define _RENDERFORCEDMATMESHMGR_H_ - -#ifndef _RENDERMESHMGR_H_ #include "renderInstance/renderMeshMgr.h" -#endif class Material; diff --git a/Engine/source/renderInstance/renderBinManager.h b/Engine/source/renderInstance/renderBinManager.h index f30eee046..82b4b142a 100644 --- a/Engine/source/renderInstance/renderBinManager.h +++ b/Engine/source/renderInstance/renderBinManager.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 _RENDERBINMANAGER_H_ #define _RENDERBINMANAGER_H_ - -#ifndef _CONSOLEOBJECT_H_ #include "console/consoleObject.h" -#endif -#ifndef _RENDERPASSMANAGER_H_ + #include "renderInstance/renderPassManager.h" -#endif -#ifndef _BASEMATINSTANCE_H_ + #include "materials/baseMatInstance.h" -#endif -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif class SceneRenderState; diff --git a/Engine/source/renderInstance/renderDeferredMgr.h b/Engine/source/renderInstance/renderDeferredMgr.h index 84ef80c85..59379b547 100644 --- a/Engine/source/renderInstance/renderDeferredMgr.h +++ b/Engine/source/renderInstance/renderDeferredMgr.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 _DEFERRED_MGR_H_ #define _DEFERRED_MGR_H_ diff --git a/Engine/source/renderInstance/renderFormatChanger.h b/Engine/source/renderInstance/renderFormatChanger.h index 09bc6c384..ad339cb72 100644 --- a/Engine/source/renderInstance/renderFormatChanger.h +++ b/Engine/source/renderInstance/renderFormatChanger.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 _RENDERFORMATCHANGER_H_ #define _RENDERFORMATCHANGER_H_ - -#ifndef _RENDERPASSSTATETOKEN_H_ #include "renderInstance/renderPassStateToken.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif class PostEffect; diff --git a/Engine/source/renderInstance/renderImposterMgr.h b/Engine/source/renderInstance/renderImposterMgr.h index f870c6e77..43280410d 100644 --- a/Engine/source/renderInstance/renderImposterMgr.h +++ b/Engine/source/renderInstance/renderImposterMgr.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 _IMPOSTERRENDERMGR_H_ #define _IMPOSTERRENDERMGR_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif -#ifndef _TSLASTDETAIL_H_ + #include "ts/tsLastDetail.h" -#endif class TSLastDetail; class GFXTextureObject; diff --git a/Engine/source/renderInstance/renderMeshMgr.h b/Engine/source/renderInstance/renderMeshMgr.h index 20a3f38f4..6ba4833b1 100644 --- a/Engine/source/renderInstance/renderMeshMgr.h +++ b/Engine/source/renderInstance/renderMeshMgr.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 _RENDERMESHMGR_H_ #define _RENDERMESHMGR_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif //************************************************************************** // RenderMeshMgr diff --git a/Engine/source/renderInstance/renderObjectMgr.h b/Engine/source/renderInstance/renderObjectMgr.h index c8ef9c575..76d12d92c 100644 --- a/Engine/source/renderInstance/renderObjectMgr.h +++ b/Engine/source/renderInstance/renderObjectMgr.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 _RENDEROBJECTMGR_H_ #define _RENDEROBJECTMGR_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif //************************************************************************** // RenderObjectMgr diff --git a/Engine/source/renderInstance/renderOcclusionMgr.h b/Engine/source/renderInstance/renderOcclusionMgr.h index 893274f9d..e6ab7cc4d 100644 --- a/Engine/source/renderInstance/renderOcclusionMgr.h +++ b/Engine/source/renderInstance/renderOcclusionMgr.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 _RENDEROCCLUSIONMGR_H_ #define _RENDEROCCLUSIONMGR_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif class Material; class BaseMatInstance; diff --git a/Engine/source/renderInstance/renderParticleMgr.h b/Engine/source/renderInstance/renderParticleMgr.h index 6409e6516..62214e0fa 100644 --- a/Engine/source/renderInstance/renderParticleMgr.h +++ b/Engine/source/renderInstance/renderParticleMgr.h @@ -19,17 +19,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _RENDER_PARTICLE_MGR_H_ #define _RENDER_PARTICLE_MGR_H_ - -#ifndef _TEXTARGETBIN_MGR_H_ #include "renderInstance/renderTexTargetBinManager.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ #include "gfx/gfxPrimitiveBuffer.h" -#endif GFXDeclareVertexFormat( CompositeQuadVert ) { diff --git a/Engine/source/renderInstance/renderPassManager.h b/Engine/source/renderInstance/renderPassManager.h index af30ea74e..ced21d0a7 100644 --- a/Engine/source/renderInstance/renderPassManager.h +++ b/Engine/source/renderInstance/renderPassManager.h @@ -19,33 +19,25 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _RENDERPASSMANAGER_H_ #define _RENDERPASSMANAGER_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _SCENEOBJECT_H_ + #include "scene/sceneObject.h" -#endif -#ifndef _SIMOBJECT_H_ + #include "console/simObject.h" -#endif -#ifndef _DATACHUNKER_H_ + #include "core/dataChunker.h" -#endif -#ifndef _SCENEMANAGER_H_ + #include "scene/sceneManager.h" -#endif -#ifndef _SCENEMANAGER_H_ + #include "scene/sceneManager.h" -#endif -#ifndef _CUBEMAPDATA_H_ + #include "gfx/sim/cubemapData.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif class SceneRenderState; class ISceneObject; diff --git a/Engine/source/renderInstance/renderPassStateToken.h b/Engine/source/renderInstance/renderPassStateToken.h index 2786cd43b..4ef08ca8d 100644 --- a/Engine/source/renderInstance/renderPassStateToken.h +++ b/Engine/source/renderInstance/renderPassStateToken.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 _RENDERPASSSTATETOKEN_H_ #define _RENDERPASSSTATETOKEN_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif class RenderPassStateBin; diff --git a/Engine/source/renderInstance/renderProbeMgr.h b/Engine/source/renderInstance/renderProbeMgr.h index b7e89cac4..80b2e8fc1 100644 --- a/Engine/source/renderInstance/renderProbeMgr.h +++ b/Engine/source/renderInstance/renderProbeMgr.h @@ -22,35 +22,22 @@ #pragma once #ifndef RENDER_PROBE_MGR_H #define RENDER_PROBE_MGR_H - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif -#ifndef _MATINSTANCE_H_ + #include "materials/matInstance.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif //#include "core/util/systemInterfaceList.h" - -#ifndef _MATERIALS_PROCESSEDSHADERMATERIAL_H_ #include "materials/processedShaderMaterial.h" -#endif -#ifndef _POSTEFFECTCOMMON_H_ -#include "postFx/postEffectCommon.h" -#endif -#ifndef _REFLECTOR_H_ +#include "postFx/postEffectCommon.h" + #include "scene/reflector.h" -#endif #ifndef REFLECTIONPROBE_H #include "T3D/lighting/reflectionProbe.h" diff --git a/Engine/source/renderInstance/renderTerrainMgr.h b/Engine/source/renderInstance/renderTerrainMgr.h index 0e819da8e..96a4131ce 100644 --- a/Engine/source/renderInstance/renderTerrainMgr.h +++ b/Engine/source/renderInstance/renderTerrainMgr.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 _RENDERTERRAINMGR_H_ #define _RENDERTERRAINMGR_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ + #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif class TerrCell; class GFXTextureObject; diff --git a/Engine/source/renderInstance/renderTexTargetBinManager.h b/Engine/source/renderInstance/renderTexTargetBinManager.h index 90d4fd02e..665ab9ae2 100644 --- a/Engine/source/renderInstance/renderTexTargetBinManager.h +++ b/Engine/source/renderInstance/renderTexTargetBinManager.h @@ -19,15 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TEXTARGETBIN_MGR_H_ #define _TEXTARGETBIN_MGR_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif class ConditionerFeature; diff --git a/Engine/source/renderInstance/renderTranslucentMgr.h b/Engine/source/renderInstance/renderTranslucentMgr.h index 8c01402b2..61c854993 100644 --- a/Engine/source/renderInstance/renderTranslucentMgr.h +++ b/Engine/source/renderInstance/renderTranslucentMgr.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 _RENDER_TRANSLUCENT_MGR_H_ #define _RENDER_TRANSLUCENT_MGR_H_ - -#ifndef _RENDERBINMANAGER_H_ #include "renderInstance/renderBinManager.h" -#endif -#ifndef _MATTEXTURETARGET_H_ + #include "materials/matTextureTarget.h" -#endif class RenderParticleMgr; diff --git a/Engine/source/scene/culling/sceneCullingState.h b/Engine/source/scene/culling/sceneCullingState.h index 4361907ce..136fcf187 100644 --- a/Engine/source/scene/culling/sceneCullingState.h +++ b/Engine/source/scene/culling/sceneCullingState.h @@ -19,34 +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 _SCENECULLINGSTATE_H_ #define _SCENECULLINGSTATE_H_ - -#ifndef _SCENEZONECULLINGSTATE_H_ #include "scene/culling/sceneZoneCullingState.h" -#endif - -#ifndef _MATHUTIL_FRUSTUM_H_ #include "math/util/frustum.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _SCENECAMERASTATE_H_ #include "scene/sceneCameraState.h" -#endif -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif -#ifndef _BITVECTOR_H_ #include "core/bitVector.h" -#endif - class SceneObject; class SceneManager; diff --git a/Engine/source/scene/culling/sceneCullingVolume.h b/Engine/source/scene/culling/sceneCullingVolume.h index 6d3306269..1e163cb08 100644 --- a/Engine/source/scene/culling/sceneCullingVolume.h +++ b/Engine/source/scene/culling/sceneCullingVolume.h @@ -19,14 +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 _SCENECULLINGVOLUME_H_ #define _SCENECULLINGVOLUME_H_ - -#ifndef _MPLANESET_H_ #include "math/mPlaneSet.h" -#endif - /// A volume used to include or exclude space in a scene. /// diff --git a/Engine/source/scene/culling/sceneZoneCullingState.h b/Engine/source/scene/culling/sceneZoneCullingState.h index 48494296b..fde5a4093 100644 --- a/Engine/source/scene/culling/sceneZoneCullingState.h +++ b/Engine/source/scene/culling/sceneZoneCullingState.h @@ -19,14 +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 _SCENEZONECULLINGSTATE_H_ #define _SCENEZONECULLINGSTATE_H_ - -#ifndef _SCENECULLINGVOLUME_H_ #include "scene/culling/sceneCullingVolume.h" -#endif - /// Culling state for a zone. /// diff --git a/Engine/source/scene/fogStructs.h b/Engine/source/scene/fogStructs.h index f051ee88f..cc73ee694 100644 --- a/Engine/source/scene/fogStructs.h +++ b/Engine/source/scene/fogStructs.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 _FOGSTRUCTS_H_ #define _FOGSTRUCTS_H_ diff --git a/Engine/source/scene/mixin/sceneAmbientSoundObject.h b/Engine/source/scene/mixin/sceneAmbientSoundObject.h index 24bf95078..de64a278d 100644 --- a/Engine/source/scene/mixin/sceneAmbientSoundObject.h +++ b/Engine/source/scene/mixin/sceneAmbientSoundObject.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 _SCENEAMBIENTSOUNDOBJECT_H_ #define _SCENEAMBIENTSOUNDOBJECT_H_ diff --git a/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h b/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h index 8953ac73c..55203902f 100644 --- a/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h +++ b/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.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 _SCENEAMBIENTSOUNDOBJECT_IMPL_H_ #define _SCENEAMBIENTSOUNDOBJECT_IMPL_H_ diff --git a/Engine/source/scene/mixin/scenePolyhedralObject.h b/Engine/source/scene/mixin/scenePolyhedralObject.h index 1e9599565..435455cd4 100644 --- a/Engine/source/scene/mixin/scenePolyhedralObject.h +++ b/Engine/source/scene/mixin/scenePolyhedralObject.h @@ -19,14 +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 _SCENEPOLYHEDRALOBJECT_H_ #define _SCENEPOLYHEDRALOBJECT_H_ - -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif - /// Shared interface for polyhedral objects. struct IScenePolyhedralObject diff --git a/Engine/source/scene/mixin/scenePolyhedralObject.impl.h b/Engine/source/scene/mixin/scenePolyhedralObject.impl.h index 32ec98e71..72053fa73 100644 --- a/Engine/source/scene/mixin/scenePolyhedralObject.impl.h +++ b/Engine/source/scene/mixin/scenePolyhedralObject.impl.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 _SCENEPOLYHEDRALOBJECT_IMPL_H_ #define _SCENEPOLYHEDRALOBJECT_IMPL_H_ diff --git a/Engine/source/scene/pathManager.h b/Engine/source/scene/pathManager.h index e7c57416c..604b13f4c 100644 --- a/Engine/source/scene/pathManager.h +++ b/Engine/source/scene/pathManager.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 _PATHMANAGER_H_ #define _PATHMANAGER_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MQUAT_H_ + #include "math/mQuat.h" -#endif -#ifndef _SCENEOBJECT_H_ + #include "scene/sceneObject.h" -#endif class NetConnection; class BitStream; diff --git a/Engine/source/scene/reflectionManager.h b/Engine/source/scene/reflectionManager.h index 1fbd46e0e..3e612561e 100644 --- a/Engine/source/scene/reflectionManager.h +++ b/Engine/source/scene/reflectionManager.h @@ -19,28 +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 _REFLECTIONMANAGER_H_ #define _REFLECTIONMANAGER_H_ - -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _TSINGLETON_H_ + #include "core/util/tSingleton.h" -#endif -#ifndef _REFLECTOR_H_ + #include "scene/reflector.h" -#endif class PlatformTimer; class BaseMatInstance; diff --git a/Engine/source/scene/reflectionMatHook.h b/Engine/source/scene/reflectionMatHook.h index c90444a38..6544900cc 100644 --- a/Engine/source/scene/reflectionMatHook.h +++ b/Engine/source/scene/reflectionMatHook.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 _REFLECTIONMATHOOK_H_ #define _REFLECTIONMATHOOK_H_ - -#ifndef _MATINSTANCEHOOK_H_ #include "materials/matInstanceHook.h" -#endif -#ifndef _MATINSTANCE_H_ + #include "materials/matInstance.h" -#endif class ReflectionMatInstance : public MatInstance { diff --git a/Engine/source/scene/reflector.h b/Engine/source/scene/reflector.h index ed9051bac..38b519139 100644 --- a/Engine/source/scene/reflector.h +++ b/Engine/source/scene/reflector.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 _REFLECTOR_H_ #define _REFLECTOR_H_ - -#ifndef _GFXCUBEMAP_H_ #include "gfx/gfxCubemap.h" -#endif -#ifndef _GFXTARGET_H_ + #include "gfx/gfxTarget.h" -#endif -#ifndef _SIMDATABLOCK_H_ + #include "console/simDatablock.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif -#ifndef _MATHUTIL_FRUSTUM_H_ #include "math/util/frustum.h" -#endif struct CameraQuery; class Point2I; diff --git a/Engine/source/scene/sceneCameraState.h b/Engine/source/scene/sceneCameraState.h index 059f8689a..bc6fb73c6 100644 --- a/Engine/source/scene/sceneCameraState.h +++ b/Engine/source/scene/sceneCameraState.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 _SCENECAMERASTATE_H_ #define _SCENECAMERASTATE_H_ - -#ifndef _MATHUTIL_FRUSTUM_H_ #include "math/util/frustum.h" -#endif -#ifndef _MRECT_H_ #include "math/mRect.h" -#endif -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif - /// An object that combines all the state that is relevant to looking into the /// scene from a particular point of view. diff --git a/Engine/source/scene/sceneContainer.h b/Engine/source/scene/sceneContainer.h index 57fc211de..3c25292cf 100644 --- a/Engine/source/scene/sceneContainer.h +++ b/Engine/source/scene/sceneContainer.h @@ -24,34 +24,22 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _SCENECONTAINER_H_ #define _SCENECONTAINER_H_ - -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif -#ifndef _MSPHERE_H_ #include "math/mSphere.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MPOLYHEDRON_H_ #include "math/mPolyhedron.h" -#endif -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif - /// @file /// SceneObject database. diff --git a/Engine/source/scene/sceneManager.h b/Engine/source/scene/sceneManager.h index 6ec883a95..8a3398abc 100644 --- a/Engine/source/scene/sceneManager.h +++ b/Engine/source/scene/sceneManager.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 _SCENEMANAGER_H_ #define _SCENEMANAGER_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _SCENEZONESPACEMANAGER_H_ #include "scene/zones/sceneZoneSpaceManager.h" -#endif -#ifndef _MRECT_H_ #include "math/mRect.h" -#endif -#ifndef _COLOR_H_ #include "core/color.h" -#endif -#ifndef _INTERPOLATEDCHANGEPROPERTY_H_ #include "util/interpolatedChangeProperty.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ #include "gfx/gfxTextureHandle.h" -#endif -#ifndef _FOGSTRUCTS_H_ #include "scene/fogStructs.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _SCENECONTAINER_H_ #include "scene/sceneContainer.h" -#endif - class LightManager; class SceneRootZone; diff --git a/Engine/source/scene/sceneObject.cpp b/Engine/source/scene/sceneObject.cpp index b73326ae5..b279353a0 100644 --- a/Engine/source/scene/sceneObject.cpp +++ b/Engine/source/scene/sceneObject.cpp @@ -50,6 +50,8 @@ #include "T3D/gameBase/gameConnection.h" #include "T3D/accumulationVolume.h" +template class Vector; + IMPLEMENT_CONOBJECT(SceneObject); ConsoleDocClass( SceneObject, diff --git a/Engine/source/scene/sceneObject.h b/Engine/source/scene/sceneObject.h index e12f1a0f8..70430dd8b 100644 --- a/Engine/source/scene/sceneObject.h +++ b/Engine/source/scene/sceneObject.h @@ -24,56 +24,31 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once -#ifndef _SCENEOBJECT_H_ -#define _SCENEOBJECT_H_ - -#ifndef _NETOBJECT_H_ #include "sim/netObject.h" -#endif -#ifndef _COLLISION_H_ #include "collision/collision.h" -#endif -#ifndef _OBJECTTYPES_H_ #include "T3D/objectTypes.h" -#endif -#ifndef _COLOR_H_ #include "core/color.h" -#endif -#ifndef _BITSET_H_ #include "core/bitSet.h" -#endif -#ifndef _PROCESSLIST_H_ #include "T3D/gameBase/processList.h" -#endif -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _TSRENDERDATA_H_ + #include "ts/tsRenderState.h" -#endif - -#ifndef _COLLADA_UTILS_H_ #include "ts/collada/colladaUtils.h" -#endif -#ifndef _ASSET_PTR_H_ #include "assets/assetPtr.h" -#endif + #ifndef GAME_OBJECT_ASSET_H #include "T3D/assets/GameObjectAsset.h" #endif - -#ifndef _SCENEQUERY_UTIL_H_ #include "scene/sceneQueryUtil.h" -#endif - class SceneManager; class SceneRenderState; @@ -91,6 +66,8 @@ struct ObjectRenderInst; struct Move; struct SceneRayHelper; +extern template class Vector; + /// A 3D object. /// /// @section SceneObject_intro Introduction @@ -917,6 +894,3 @@ class SceneObject : public NetObject, public ProcessObject virtual void getUtilizedAssets(Vector* usedAssetsList) {} }; - -#endif // _SCENEOBJECT_H_ - diff --git a/Engine/source/scene/sceneObjectLightingPlugin.h b/Engine/source/scene/sceneObjectLightingPlugin.h index 177d2768c..c1ddce89b 100644 --- a/Engine/source/scene/sceneObjectLightingPlugin.h +++ b/Engine/source/scene/sceneObjectLightingPlugin.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 _SCENEOBJECTLIGHTINGPLUGIN_H_ #define _SCENEOBJECTLIGHTINGPLUGIN_H_ diff --git a/Engine/source/scene/scenePolyhedralSpace.h b/Engine/source/scene/scenePolyhedralSpace.h index 154fd52e7..dd591cbff 100644 --- a/Engine/source/scene/scenePolyhedralSpace.h +++ b/Engine/source/scene/scenePolyhedralSpace.h @@ -19,17 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SCENEPOLYHEDRALSPACE_H_ #define _SCENEPOLYHEDRALSPACE_H_ - -#ifndef _SCENESPACE_H_ #include "scene/sceneSpace.h" -#endif -#ifndef _SCENEPOLYHEDRALOBJECT_H_ #include "scene/mixin/scenePolyhedralObject.h" -#endif + #include "scene/mixin/scenePolyhedralObject.impl.h" /// diff --git a/Engine/source/scene/sceneQueryUtil.h b/Engine/source/scene/sceneQueryUtil.h index 5c913127b..a364fe856 100644 --- a/Engine/source/scene/sceneQueryUtil.h +++ b/Engine/source/scene/sceneQueryUtil.h @@ -1,3 +1,4 @@ +#pragma once #ifndef _SCENEQUERY_UTIL_H_ #define _SCENEQUERY_UTIL_H_ diff --git a/Engine/source/scene/sceneRenderState.h b/Engine/source/scene/sceneRenderState.h index 37d4763ab..e23b62521 100644 --- a/Engine/source/scene/sceneRenderState.h +++ b/Engine/source/scene/sceneRenderState.h @@ -19,26 +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 _SCENERENDERSTATE_H_ #define _SCENERENDERSTATE_H_ - -#ifndef _COLOR_H_ #include "core/color.h" -#endif -#ifndef _SCENEMANAGER_H_ #include "scene/sceneManager.h" -#endif -#ifndef _SCENECULLINGSTATE_H_ #include "scene/culling/sceneCullingState.h" -#endif - -#ifndef _UTIL_DELEGATE_H_ #include "core/util/delegate.h" -#endif - class SceneObject; class RenderPassManager; diff --git a/Engine/source/scene/sceneSpace.h b/Engine/source/scene/sceneSpace.h index fb13abc74..08ce737e7 100644 --- a/Engine/source/scene/sceneSpace.h +++ b/Engine/source/scene/sceneSpace.h @@ -19,14 +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 _SCENESPACE_H_ #define _SCENESPACE_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif - /// Abstract base class for SceneObjects that define subspaces in a scene. /// diff --git a/Engine/source/scene/sceneTracker.h b/Engine/source/scene/sceneTracker.h index ea57d0daf..06531542a 100644 --- a/Engine/source/scene/sceneTracker.h +++ b/Engine/source/scene/sceneTracker.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 _SCENETRACKER_H_ #define _SCENETRACKER_H_ diff --git a/Engine/source/scene/sgUtil.h b/Engine/source/scene/sgUtil.h index 4a5b982eb..a25d96b06 100644 --- a/Engine/source/scene/sgUtil.h +++ b/Engine/source/scene/sgUtil.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 _SGUTIL_H_ #define _SGUTIL_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif class Frustum; class RectI; diff --git a/Engine/source/scene/simPath.h b/Engine/source/scene/simPath.h index 4c95f6771..8327f3c45 100644 --- a/Engine/source/scene/simPath.h +++ b/Engine/source/scene/simPath.h @@ -19,26 +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 _SIMPATH_H_ #define _SIMPATH_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 -#ifndef _STATICSHAPE_H_ +#include "gfx/gfxStateBlock.h" + +#include "gfx/gfxVertexBuffer.h" + +#include "gfx/gfxPrimitiveBuffer.h" + #include "T3D/staticShape.h" -#endif class BaseMatInstance; struct PathShapeData; diff --git a/Engine/source/scene/zones/scenePolyhedralZone.h b/Engine/source/scene/zones/scenePolyhedralZone.h index f0ac7fd0a..2c09eab5d 100644 --- a/Engine/source/scene/zones/scenePolyhedralZone.h +++ b/Engine/source/scene/zones/scenePolyhedralZone.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 _SCENEPOLYHEDRALZONE_H_ #define _SCENEPOLYHEDRALZONE_H_ - -#ifndef _SCENESIMPLEZONE_H_ #include "scene/zones/sceneSimpleZone.h" -#endif -#ifndef _SCENEPOLYHEDRALOBJECT_H_ #include "scene/mixin/scenePolyhedralObject.h" -#endif -#ifndef _MINTERSECTOR_H_ #include "math/mIntersector.h" -#endif - /// A simple zone space that is described by a polyhedron. /// diff --git a/Engine/source/scene/zones/sceneRootZone.h b/Engine/source/scene/zones/sceneRootZone.h index 989d64ea5..9dfbe80d0 100644 --- a/Engine/source/scene/zones/sceneRootZone.h +++ b/Engine/source/scene/zones/sceneRootZone.h @@ -19,15 +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 _SCENEROOTZONE_H_ #define _SCENEROOTZONE_H_ - -#ifndef _SCENESIMPLEZONE_H_ #include "scene/zones/sceneSimpleZone.h" -#endif - - /// Root zone in a scene. /// diff --git a/Engine/source/scene/zones/sceneSimpleZone.h b/Engine/source/scene/zones/sceneSimpleZone.h index ffee2f7cb..ad0074f5e 100644 --- a/Engine/source/scene/zones/sceneSimpleZone.h +++ b/Engine/source/scene/zones/sceneSimpleZone.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 _SCENESIMPLEZONE_H_ #define _SCENESIMPLEZONE_H_ - -#ifndef _SCENEZONESPACE_H_ #include "scene/zones/sceneZoneSpace.h" -#endif -#ifndef _MORIENTEDBOX_H_ #include "math/mOrientedBox.h" -#endif - class SceneRenderState; class BaseMatInstance; diff --git a/Engine/source/scene/zones/sceneTraversalState.h b/Engine/source/scene/zones/sceneTraversalState.h index 47dc57bfa..f202738ee 100644 --- a/Engine/source/scene/zones/sceneTraversalState.h +++ b/Engine/source/scene/zones/sceneTraversalState.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 _SCENETRAVERSALSTATE_H_ #define _SCENETRAVERSALSTATE_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MBOX_H_ #include "math/mBox.h" -#endif -#ifndef _MPLANESET_H_ #include "math/mPlaneSet.h" -#endif - class SceneCullingState; class SceneCullingVolume; diff --git a/Engine/source/scene/zones/sceneZoneSpace.h b/Engine/source/scene/zones/sceneZoneSpace.h index 2fe26788a..b7cf9ad27 100644 --- a/Engine/source/scene/zones/sceneZoneSpace.h +++ b/Engine/source/scene/zones/sceneZoneSpace.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 _SCENEZONESPACE_H_ #define _SCENEZONESPACE_H_ - -#ifndef _SCENESPACE_H_ #include "scene/sceneSpace.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif - class SceneZoneSpaceManager; class SceneCullingState; diff --git a/Engine/source/scene/zones/sceneZoneSpaceManager.h b/Engine/source/scene/zones/sceneZoneSpaceManager.h index 860d24a51..bbd75846f 100644 --- a/Engine/source/scene/zones/sceneZoneSpaceManager.h +++ b/Engine/source/scene/zones/sceneZoneSpaceManager.h @@ -19,31 +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 _SCENEZONESPACEMANAGER_H_ #define _SCENEZONESPACEMANAGER_H_ - -#ifndef _SCENEOBJECT_H_ #include "scene/sceneObject.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif -#ifndef _SCENECONTAINER_H_ #include "scene/sceneContainer.h" -#endif - - class SceneContainer; class SceneRootZone; diff --git a/Engine/source/sfx/media/sfxSndStream.h b/Engine/source/sfx/media/sfxSndStream.h index c190ab772..d6338454d 100644 --- a/Engine/source/sfx/media/sfxSndStream.h +++ b/Engine/source/sfx/media/sfxSndStream.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 _SFXSNDSTREAM_H_ #define _SFXSNDSTREAM_H_ diff --git a/Engine/source/sfx/null/sfxNullBuffer.h b/Engine/source/sfx/null/sfxNullBuffer.h index ce90aad14..7674a2c19 100644 --- a/Engine/source/sfx/null/sfxNullBuffer.h +++ b/Engine/source/sfx/null/sfxNullBuffer.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 _SFXNULLBUFFER_H_ #define _SFXNULLBUFFER_H_ diff --git a/Engine/source/sfx/null/sfxNullDevice.h b/Engine/source/sfx/null/sfxNullDevice.h index d3b73a191..cb242af1a 100644 --- a/Engine/source/sfx/null/sfxNullDevice.h +++ b/Engine/source/sfx/null/sfxNullDevice.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 _SFXNULLDEVICE_H_ #define _SFXNULLDEVICE_H_ diff --git a/Engine/source/sfx/null/sfxNullVoice.h b/Engine/source/sfx/null/sfxNullVoice.h index b28cb6629..7fcb96c06 100644 --- a/Engine/source/sfx/null/sfxNullVoice.h +++ b/Engine/source/sfx/null/sfxNullVoice.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 _SFXNULLVOICE_H_ #define _SFXNULLVOICE_H_ diff --git a/Engine/source/sfx/openal/LoadOAL.h b/Engine/source/sfx/openal/LoadOAL.h index 40495ae56..bae0c7bcd 100644 --- a/Engine/source/sfx/openal/LoadOAL.h +++ b/Engine/source/sfx/openal/LoadOAL.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 _LOADOAL_H_ #define _LOADOAL_H_ diff --git a/Engine/source/sfx/openal/sfxALBuffer.h b/Engine/source/sfx/openal/sfxALBuffer.h index 609add4f1..87ca3f237 100644 --- a/Engine/source/sfx/openal/sfxALBuffer.h +++ b/Engine/source/sfx/openal/sfxALBuffer.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 _SFXALBUFFER_H_ #define _SFXALBUFFER_H_ diff --git a/Engine/source/sfx/openal/sfxALCaps.h b/Engine/source/sfx/openal/sfxALCaps.h index 6a13e788e..e423e3983 100644 --- a/Engine/source/sfx/openal/sfxALCaps.h +++ b/Engine/source/sfx/openal/sfxALCaps.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 _SFXALCAPS_H_ #define _SFXALCAPS_H_ diff --git a/Engine/source/sfx/openal/sfxALDevice.h b/Engine/source/sfx/openal/sfxALDevice.h index 5ccf3e270..90425ae5e 100644 --- a/Engine/source/sfx/openal/sfxALDevice.h +++ b/Engine/source/sfx/openal/sfxALDevice.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 _SFXALDEVICE_H_ #define _SFXALDEVICE_H_ diff --git a/Engine/source/sfx/openal/sfxALVoice.h b/Engine/source/sfx/openal/sfxALVoice.h index 770918fec..eb7e83bfc 100644 --- a/Engine/source/sfx/openal/sfxALVoice.h +++ b/Engine/source/sfx/openal/sfxALVoice.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 _SFXALVOICE_H_ #define _SFXALVOICE_H_ diff --git a/Engine/source/sfx/sfxAmbience.h b/Engine/source/sfx/sfxAmbience.h index d429e5570..317cc3791 100644 --- a/Engine/source/sfx/sfxAmbience.h +++ b/Engine/source/sfx/sfxAmbience.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 _SFXAMBIENCE_H_ #define _SFXAMBIENCE_H_ diff --git a/Engine/source/sfx/sfxBuffer.h b/Engine/source/sfx/sfxBuffer.h index bf00e40ee..f2400bf83 100644 --- a/Engine/source/sfx/sfxBuffer.h +++ b/Engine/source/sfx/sfxBuffer.h @@ -19,30 +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 _SFXBUFFER_H_ #define _SFXBUFFER_H_ - -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _TSIGNAL_H_ #include "core/util/tSignal.h" -#endif -#ifndef _TSTREAM_H_ #include "core/stream/tStream.h" -#endif -#ifndef _SFXCOMMON_H_ #include "sfx/sfxCommon.h" -#endif -#ifndef _THREADSAFEREFCOUNT_H_ #include "platform/threads/threadSafeRefCount.h" -#endif - class SFXStream; class SFXDescription; diff --git a/Engine/source/sfx/sfxCommon.h b/Engine/source/sfx/sfxCommon.h index 22ff258c1..a85ca0eae 100644 --- a/Engine/source/sfx/sfxCommon.h +++ b/Engine/source/sfx/sfxCommon.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 _SFXCOMMON_H_ #define _SFXCOMMON_H_ diff --git a/Engine/source/sfx/sfxController.h b/Engine/source/sfx/sfxController.h index 0d3b26f3d..51e2acba4 100644 --- a/Engine/source/sfx/sfxController.h +++ b/Engine/source/sfx/sfxController.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 _SFXCONTROLLER_H_ #define _SFXCONTROLLER_H_ diff --git a/Engine/source/sfx/sfxDescription.h b/Engine/source/sfx/sfxDescription.h index dc0aecc20..864d31bc4 100644 --- a/Engine/source/sfx/sfxDescription.h +++ b/Engine/source/sfx/sfxDescription.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 _SFXDESCRIPTION_H_ #define _SFXDESCRIPTION_H_ diff --git a/Engine/source/sfx/sfxDevice.h b/Engine/source/sfx/sfxDevice.h index d75d6aacf..b91ab21ff 100644 --- a/Engine/source/sfx/sfxDevice.h +++ b/Engine/source/sfx/sfxDevice.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 _SFXDEVICE_H_ #define _SFXDEVICE_H_ diff --git a/Engine/source/sfx/sfxEnvironment.h b/Engine/source/sfx/sfxEnvironment.h index 5afad1acc..7ef03b06f 100644 --- a/Engine/source/sfx/sfxEnvironment.h +++ b/Engine/source/sfx/sfxEnvironment.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 _SFXENVIRONMENT_H_ #define _SFXENVIRONMENT_H_ diff --git a/Engine/source/sfx/sfxFileStream.h b/Engine/source/sfx/sfxFileStream.h index 3e2a025ef..d6560ca37 100644 --- a/Engine/source/sfx/sfxFileStream.h +++ b/Engine/source/sfx/sfxFileStream.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 _SFXFILESTREAM_H_ #define _SFXFILESTREAM_H_ diff --git a/Engine/source/sfx/sfxInternal.h b/Engine/source/sfx/sfxInternal.h index 7d2c49df2..2b78c3b12 100644 --- a/Engine/source/sfx/sfxInternal.h +++ b/Engine/source/sfx/sfxInternal.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 _SFXINTERNAL_H_ #define _SFXINTERNAL_H_ diff --git a/Engine/source/sfx/sfxMemoryStream.h b/Engine/source/sfx/sfxMemoryStream.h index 2421add45..76c2bca63 100644 --- a/Engine/source/sfx/sfxMemoryStream.h +++ b/Engine/source/sfx/sfxMemoryStream.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 _SFXMEMORYSTREAM_H_ #define _SFXMEMORYSTREAM_H_ diff --git a/Engine/source/sfx/sfxModifier.h b/Engine/source/sfx/sfxModifier.h index 07fce959d..e742060ec 100644 --- a/Engine/source/sfx/sfxModifier.h +++ b/Engine/source/sfx/sfxModifier.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 _SFXMODIFIER_H_ #define _SFXMODIFIER_H_ diff --git a/Engine/source/sfx/sfxParameter.h b/Engine/source/sfx/sfxParameter.h index 80f311c7c..f8dca57a9 100644 --- a/Engine/source/sfx/sfxParameter.h +++ b/Engine/source/sfx/sfxParameter.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 _SFXPARAMETER_H_ #define _SFXPARAMETER_H_ diff --git a/Engine/source/sfx/sfxPlayList.h b/Engine/source/sfx/sfxPlayList.h index 60f0e3ac2..2188a5232 100644 --- a/Engine/source/sfx/sfxPlayList.h +++ b/Engine/source/sfx/sfxPlayList.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 _SFXPLAYLIST_H_ #define _SFXPLAYLIST_H_ @@ -29,10 +31,7 @@ #ifndef _SFXTRACK_H_ #include "sfx/sfxTrack.h" #endif - -#ifndef _TYPEVALIDATORS_H_ #include "console/typeValidators.h" -#endif class SFXState; class SFXDescription; diff --git a/Engine/source/sfx/sfxProfile.h b/Engine/source/sfx/sfxProfile.h index 3a08f155e..664058af1 100644 --- a/Engine/source/sfx/sfxProfile.h +++ b/Engine/source/sfx/sfxProfile.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 _SFXPROFILE_H_ #define _SFXPROFILE_H_ diff --git a/Engine/source/sfx/sfxProvider.h b/Engine/source/sfx/sfxProvider.h index aa4209be9..9258a43ea 100644 --- a/Engine/source/sfx/sfxProvider.h +++ b/Engine/source/sfx/sfxProvider.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 _SFXPROVIDER_H_ #define _SFXPROVIDER_H_ diff --git a/Engine/source/sfx/sfxResource.h b/Engine/source/sfx/sfxResource.h index d88532424..396bcf887 100644 --- a/Engine/source/sfx/sfxResource.h +++ b/Engine/source/sfx/sfxResource.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 _SFXRESOURCE_H_ #define _SFXRESOURCE_H_ @@ -29,10 +31,7 @@ #ifndef __RESOURCE_H__ #include "core/resource.h" #endif - -#ifndef _SFXSTREAM_H_ #include "sfx/sfxStream.h" -#endif /// This is the base class for all sound file resources including /// streamed sound files. It acts much like an always in-core diff --git a/Engine/source/sfx/sfxSound.h b/Engine/source/sfx/sfxSound.h index c3c5dd8c5..21cabdb11 100644 --- a/Engine/source/sfx/sfxSound.h +++ b/Engine/source/sfx/sfxSound.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 _SFXSOUND_H_ #define _SFXSOUND_H_ diff --git a/Engine/source/sfx/sfxSoundscape.h b/Engine/source/sfx/sfxSoundscape.h index 586a4a2b3..9c220e2ce 100644 --- a/Engine/source/sfx/sfxSoundscape.h +++ b/Engine/source/sfx/sfxSoundscape.h @@ -19,34 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SFXSOUNDSCAPE_H_ #define _SFXSOUNDSCAPE_H_ - -#ifndef _SFXCOMMON_H_ #include "sfx/sfxCommon.h" -#endif -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif -#ifndef _BITSET_H_ #include "core/bitSet.h" -#endif -#ifndef _TRESPONSECURVE_H_ #include "math/util/tResponseCurve.h" -#endif -#ifndef _SFXAMBIENCE_H_ #include "sfx/sfxAmbience.h" -#endif - /// @file /// The soundscape system is responsible for controlling ambient audio. diff --git a/Engine/source/sfx/sfxSource.h b/Engine/source/sfx/sfxSource.h index 6115cc091..a93b37f1a 100644 --- a/Engine/source/sfx/sfxSource.h +++ b/Engine/source/sfx/sfxSource.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 _SFXSOURCE_H_ #define _SFXSOURCE_H_ diff --git a/Engine/source/sfx/sfxState.h b/Engine/source/sfx/sfxState.h index 85f9b7b86..037483318 100644 --- a/Engine/source/sfx/sfxState.h +++ b/Engine/source/sfx/sfxState.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 _SFXSTATE_H_ #define _SFXSTATE_H_ diff --git a/Engine/source/sfx/sfxStream.h b/Engine/source/sfx/sfxStream.h index 7f965e678..3a1b21b7d 100644 --- a/Engine/source/sfx/sfxStream.h +++ b/Engine/source/sfx/sfxStream.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 _SFXSTREAM_H_ #define _SFXSTREAM_H_ diff --git a/Engine/source/sfx/sfxSystem.h b/Engine/source/sfx/sfxSystem.h index a54f4be20..6c216001d 100644 --- a/Engine/source/sfx/sfxSystem.h +++ b/Engine/source/sfx/sfxSystem.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 _SFXSYSTEM_H_ #define _SFXSYSTEM_H_ diff --git a/Engine/source/sfx/sfxTrack.h b/Engine/source/sfx/sfxTrack.h index d05c33b93..8fd8521d2 100644 --- a/Engine/source/sfx/sfxTrack.h +++ b/Engine/source/sfx/sfxTrack.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 _SFXTRACK_H_ #define _SFXTRACK_H_ diff --git a/Engine/source/sfx/sfxTypes.h b/Engine/source/sfx/sfxTypes.h index b8d605a46..66cc673d3 100644 --- a/Engine/source/sfx/sfxTypes.h +++ b/Engine/source/sfx/sfxTypes.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 _SFXTYPES_H_ #define _SFXTYPES_H_ diff --git a/Engine/source/sfx/sfxVoice.h b/Engine/source/sfx/sfxVoice.h index 593c3a1f1..9df86e7e9 100644 --- a/Engine/source/sfx/sfxVoice.h +++ b/Engine/source/sfx/sfxVoice.h @@ -19,30 +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 _SFXVOICE_H_ #define _SFXVOICE_H_ - -#ifndef _REFBASE_H_ #include "core/util/refBase.h" -#endif -#ifndef _TSTREAM_H_ #include "core/stream/tStream.h" -#endif -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _SFXBUFFER_H_ #include "sfx/sfxBuffer.h" -#endif - namespace SFXInternal { class SFXVoiceTimeSource; diff --git a/Engine/source/sfx/sfxWorld.h b/Engine/source/sfx/sfxWorld.h index 5442545be..1727f07b2 100644 --- a/Engine/source/sfx/sfxWorld.h +++ b/Engine/source/sfx/sfxWorld.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 _SFXWORLD_H_ #define _SFXWORLD_H_ diff --git a/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h b/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h index d27269c64..3c985c1b9 100644 --- a/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h @@ -19,28 +19,19 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _ACCUFEATUREGLSL_H_ -#define _ACCUFEATUREGLSL_H_ - -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ +#pragma once + #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _FEATUREMGR_H_ + #include "shaderGen/featureMgr.h" -#endif -#ifndef _MATERIALFEATURETYPES_H_ + #include "materials/materialFeatureTypes.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif /// Accu texture class AccuTexFeatGLSL : public ShaderFeatureGLSL @@ -181,5 +172,3 @@ public: String getName() override { return "Accu Specular"; } }; - -#endif \ No newline at end of file diff --git a/Engine/source/shaderGen/GLSL/bumpGLSL.h b/Engine/source/shaderGen/GLSL/bumpGLSL.h index 2dc934eed..002ea8349 100644 --- a/Engine/source/shaderGen/GLSL/bumpGLSL.h +++ b/Engine/source/shaderGen/GLSL/bumpGLSL.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 _BUMP_GLSL_H_ #define _BUMP_GLSL_H_ - -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif struct RenderPassData; class MultiLine; diff --git a/Engine/source/shaderGen/GLSL/customFeatureGLSL.h b/Engine/source/shaderGen/GLSL/customFeatureGLSL.h index df304ef10..f77128309 100644 --- a/Engine/source/shaderGen/GLSL/customFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/customFeatureGLSL.h @@ -1,21 +1,14 @@ -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _FEATUREMGR_H_ + #include "shaderGen/featureMgr.h" -#endif -#ifndef _MATERIALFEATURETYPES_H_ + #include "materials/materialFeatureTypes.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif #ifndef CUSTOMSHADERFEATURE_H #include "shaderGen/customShaderFeature.h" diff --git a/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h b/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h index cf7039f29..c73329c7c 100644 --- a/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h @@ -1,23 +1,15 @@ #pragma once - -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _FEATUREMGR_H_ + #include "shaderGen/featureMgr.h" -#endif -#ifndef _MATERIALFEATURETYPES_H_ + #include "materials/materialFeatureTypes.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif /// This should be the final feature on most pixel shaders which /// encodes the color for the current HDR target format. diff --git a/Engine/source/shaderGen/GLSL/depthGLSL.h b/Engine/source/shaderGen/GLSL/depthGLSL.h index 3c7d6fdb0..6862c7560 100644 --- a/Engine/source/shaderGen/GLSL/depthGLSL.h +++ b/Engine/source/shaderGen/GLSL/depthGLSL.h @@ -19,16 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _DEPTH_GLSL_H_ #define _DEPTH_GLSL_H_ - -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _SHADEROP_H_ -#include "shaderGen/shaderOp.h" -#endif +#include "shaderGen/shaderOp.h" class EyeSpaceDepthOutGLSL : public ShaderFeatureGLSL { diff --git a/Engine/source/shaderGen/GLSL/paraboloidGLSL.h b/Engine/source/shaderGen/GLSL/paraboloidGLSL.h index 1a0feaf1f..68ecc8486 100644 --- a/Engine/source/shaderGen/GLSL/paraboloidGLSL.h +++ b/Engine/source/shaderGen/GLSL/paraboloidGLSL.h @@ -19,15 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _PARABOLOID_GLSL_H_ #define _PARABOLOID_GLSL_H_ - -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _SHADEROP_H_ + #include "shaderGen/shaderOp.h" -#endif class GFXShaderConstHandle; diff --git a/Engine/source/shaderGen/GLSL/shaderCompGLSL.h b/Engine/source/shaderGen/GLSL/shaderCompGLSL.h index 46d2e2496..c7054ff58 100644 --- a/Engine/source/shaderGen/GLSL/shaderCompGLSL.h +++ b/Engine/source/shaderGen/GLSL/shaderCompGLSL.h @@ -19,14 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _SHADERCOMP_GLSL_H_ #define _SHADERCOMP_GLSL_H_ - -#ifndef _SHADERCOMP_H_ #include "shaderGen/shaderComp.h" -#endif - class VertPixelConnectorGLSL : public ShaderConnector { diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h index e7bcea21f..33ea0b855 100644 --- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h +++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.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 _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #define _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ diff --git a/Engine/source/shaderGen/GLSL/shaderGenGLSL.h b/Engine/source/shaderGen/GLSL/shaderGenGLSL.h index 51c84aa50..1121b5e87 100644 --- a/Engine/source/shaderGen/GLSL/shaderGenGLSL.h +++ b/Engine/source/shaderGen/GLSL/shaderGenGLSL.h @@ -19,14 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _SHADERGEN_GLSL_H_ #define _SHADERGEN_GLSL_H_ - -#ifndef _SHADERGEN_H_ #include "shaderGen/shaderGen.h" -#endif - class ShaderGenPrinterGLSL : public ShaderGenPrinter { diff --git a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h index 5f4682178..7326712dc 100644 --- a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h @@ -19,28 +19,19 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _ACCUFEATUREHLSL_H_ -#define _ACCUFEATUREHLSL_H_ - -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _FEATUREMGR_H_ + #include "shaderGen/featureMgr.h" -#endif -#ifndef _MATERIALFEATURETYPES_H_ + #include "materials/materialFeatureTypes.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif /// Accu texture class AccuTexFeatHLSL : public ShaderFeatureHLSL @@ -181,5 +172,3 @@ public: String getName() override { return "Accu Specular"; } }; - -#endif \ No newline at end of file diff --git a/Engine/source/shaderGen/HLSL/bumpHLSL.h b/Engine/source/shaderGen/HLSL/bumpHLSL.h index 23be5778c..5c47bd689 100644 --- a/Engine/source/shaderGen/HLSL/bumpHLSL.h +++ b/Engine/source/shaderGen/HLSL/bumpHLSL.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 _BUMP_HLSL_H_ #define _BUMP_HLSL_H_ - -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif struct RenderPassData; class MultiLine; diff --git a/Engine/source/shaderGen/HLSL/customFeatureHLSL.h b/Engine/source/shaderGen/HLSL/customFeatureHLSL.h index f1d92a724..047a130e2 100644 --- a/Engine/source/shaderGen/HLSL/customFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/customFeatureHLSL.h @@ -1,21 +1,14 @@ -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _FEATUREMGR_H_ + #include "shaderGen/featureMgr.h" -#endif -#ifndef _MATERIALFEATURETYPES_H_ + #include "materials/materialFeatureTypes.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif #ifndef CUSTOMSHADERFEATURE_H #include "shaderGen/customShaderFeature.h" diff --git a/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h b/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h index 53c0151e9..5e6120553 100644 --- a/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h @@ -1,23 +1,15 @@ #pragma once - -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ + #include "shaderGen/langElement.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _FEATUREMGR_H_ + #include "shaderGen/featureMgr.h" -#endif -#ifndef _MATERIALFEATURETYPES_H_ + #include "materials/materialFeatureTypes.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif /// This should be the final feature on most pixel shaders which /// encodes the color for the current HDR target format. diff --git a/Engine/source/shaderGen/HLSL/depthHLSL.h b/Engine/source/shaderGen/HLSL/depthHLSL.h index e0607f2bb..03e87e02a 100644 --- a/Engine/source/shaderGen/HLSL/depthHLSL.h +++ b/Engine/source/shaderGen/HLSL/depthHLSL.h @@ -19,16 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _DEPTH_HLSL_H_ #define _DEPTH_HLSL_H_ - -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _SHADEROP_H_ -#include "shaderGen/shaderOp.h" -#endif +#include "shaderGen/shaderOp.h" class EyeSpaceDepthOutHLSL : public ShaderFeatureHLSL { diff --git a/Engine/source/shaderGen/HLSL/paraboloidHLSL.h b/Engine/source/shaderGen/HLSL/paraboloidHLSL.h index 63e379b3c..1ccd53bd7 100644 --- a/Engine/source/shaderGen/HLSL/paraboloidHLSL.h +++ b/Engine/source/shaderGen/HLSL/paraboloidHLSL.h @@ -19,15 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _PARABOLOID_HLSL_H_ #define _PARABOLOID_HLSL_H_ - -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _SHADEROP_H_ + #include "shaderGen/shaderOp.h" -#endif class GFXShaderConstHandle; diff --git a/Engine/source/shaderGen/HLSL/shaderCompHLSL.h b/Engine/source/shaderGen/HLSL/shaderCompHLSL.h index e11e234c7..0496fff96 100644 --- a/Engine/source/shaderGen/HLSL/shaderCompHLSL.h +++ b/Engine/source/shaderGen/HLSL/shaderCompHLSL.h @@ -19,14 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _SHADERCOMP_HLSL_H_ #define _SHADERCOMP_HLSL_H_ - -#ifndef _SHADERCOMP_H_ #include "shaderGen/shaderComp.h" -#endif - class ShaderConnectorHLSL : public ShaderConnector { diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h index 627f1019a..3964070fc 100644 --- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h +++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h @@ -19,12 +19,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #define _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ - -#ifndef _SHADERFEATURE_H_ #include "shaderGen/shaderFeature.h" -#endif struct LangElement; struct MaterialFeatureData; diff --git a/Engine/source/shaderGen/HLSL/shaderGenHLSL.h b/Engine/source/shaderGen/HLSL/shaderGenHLSL.h index 74be5684a..b0e2ff58b 100644 --- a/Engine/source/shaderGen/HLSL/shaderGenHLSL.h +++ b/Engine/source/shaderGen/HLSL/shaderGenHLSL.h @@ -19,14 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _SHADERGEN_HLSL_H_ #define _SHADERGEN_HLSL_H_ - -#ifndef _SHADERGEN_H_ #include "shaderGen/shaderGen.h" -#endif - class ShaderGenPrinterHLSL : public ShaderGenPrinter { diff --git a/Engine/source/shaderGen/conditionerFeature.h b/Engine/source/shaderGen/conditionerFeature.h index b834418d7..08426bab3 100644 --- a/Engine/source/shaderGen/conditionerFeature.h +++ b/Engine/source/shaderGen/conditionerFeature.h @@ -19,15 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _CONDITIONER_BASE_H_ #define _CONDITIONER_BASE_H_ - -#ifndef _SHADERFEATURE_H_ #include "shaderGen/shaderFeature.h" -#endif -#ifndef _SHADER_DEPENDENCY_H_ #include "shaderGen/shaderDependency.h" -#endif class MultiLine; class ConditionerMethodDependency; diff --git a/Engine/source/shaderGen/customShaderFeature.h b/Engine/source/shaderGen/customShaderFeature.h index 6a452779c..4e364f01d 100644 --- a/Engine/source/shaderGen/customShaderFeature.h +++ b/Engine/source/shaderGen/customShaderFeature.h @@ -21,10 +21,7 @@ //----------------------------------------------------------------------------- #ifndef CUSTOMSHADERFEATURE_H #define CUSTOMSHADERFEATURE_H - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif #ifdef TORQUE_D3D11 class CustomFeatureHLSL; diff --git a/Engine/source/shaderGen/featureMgr.h b/Engine/source/shaderGen/featureMgr.h index 034e2ff3b..c2a131902 100644 --- a/Engine/source/shaderGen/featureMgr.h +++ b/Engine/source/shaderGen/featureMgr.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 _FEATUREMGR_H_ #define _FEATUREMGR_H_ - -#ifndef _TSINGLETON_H_ #include "core/util/tSingleton.h" -#endif -#ifndef _TVECTOR_H_ -#include "core/util/tVector.h" -#endif -#ifndef _UTIL_DELEGATE_H_ +#include "core/util/tVector.h" #include "core/util/delegate.h" -#endif class FeatureType; class ShaderFeature; diff --git a/Engine/source/shaderGen/featureSet.h b/Engine/source/shaderGen/featureSet.h index b494492fd..b07e358ba 100644 --- a/Engine/source/shaderGen/featureSet.h +++ b/Engine/source/shaderGen/featureSet.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 _FEATURESET_H_ #define _FEATURESET_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif class FeatureType; diff --git a/Engine/source/shaderGen/featureType.h b/Engine/source/shaderGen/featureType.h index eaa8d1506..23c6d645e 100644 --- a/Engine/source/shaderGen/featureType.h +++ b/Engine/source/shaderGen/featureType.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 +#pragma once #ifndef _FEATURETYPE_H_ #define _FEATURETYPE_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif class FeatureType; class FeatureSet; diff --git a/Engine/source/shaderGen/langElement.h b/Engine/source/shaderGen/langElement.h index c6f25b77a..c360337fc 100644 --- a/Engine/source/shaderGen/langElement.h +++ b/Engine/source/shaderGen/langElement.h @@ -19,20 +19,14 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _LANG_ELEMENT_H_ #define _LANG_ELEMENT_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _STREAM_H_ #include "core/stream/stream.h" -#endif -#ifndef _GFXENUMS_H_ #include "gfx/gfxEnums.h" -#endif #define WRITESTR( a ){ stream.write( dStrlen(a), a ); } diff --git a/Engine/source/shaderGen/shaderComp.h b/Engine/source/shaderGen/shaderComp.h index e1c30c42a..f92af8591 100644 --- a/Engine/source/shaderGen/shaderComp.h +++ b/Engine/source/shaderGen/shaderComp.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 +#pragma once #ifndef _SHADERCOMP_H_ #define _SHADERCOMP_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MISCSHDRDAT_H_ #include "materials/miscShdrDat.h" -#endif class Stream; struct Var; diff --git a/Engine/source/shaderGen/shaderDependency.h b/Engine/source/shaderGen/shaderDependency.h index 63a6de48b..11b73925f 100644 --- a/Engine/source/shaderGen/shaderDependency.h +++ b/Engine/source/shaderGen/shaderDependency.h @@ -19,14 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _SHADER_DEPENDENCY_H_ #define _SHADER_DEPENDENCY_H_ - -#ifndef _PATH_H_ #include "core/util/path.h" -#endif - class Stream; diff --git a/Engine/source/shaderGen/shaderFeature.h b/Engine/source/shaderGen/shaderFeature.h index 9bed4e7ac..076bd5b88 100644 --- a/Engine/source/shaderGen/shaderFeature.h +++ b/Engine/source/shaderGen/shaderFeature.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 _SHADERFEATURE_H_ #define _SHADERFEATURE_H_ - -#ifndef _MATERIALDEFINITION_H_ #include "materials/materialDefinition.h" -#endif -#ifndef _SHADERCOMP_H_ + #include "shaderGen/shaderComp.h" -#endif -#ifndef _SHADER_DEPENDENCY_H_ #include "shaderGen/shaderDependency.h" -#endif class MultiLine; struct LangElement; diff --git a/Engine/source/shaderGen/shaderGen.h b/Engine/source/shaderGen/shaderGen.h index 8ff8ef0f6..e610a3f8d 100644 --- a/Engine/source/shaderGen/shaderGen.h +++ b/Engine/source/shaderGen/shaderGen.h @@ -19,33 +19,25 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _SHADERGEN_H_ #define _SHADERGEN_H_ - -#ifndef _LANG_ELEMENT_H_ #include "shaderGen/langElement.h" -#endif -#ifndef _SHADERFEATURE_H_ + #include "shaderGen/shaderFeature.h" -#endif -#ifndef _SHADERCOMP_H_ + #include "shaderGen/shaderComp.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _AUTOPTR_H_ + #include "core/util/autoPtr.h" -#endif -#ifndef _TSINGLETON_H_ + #include "core/util/tSingleton.h" -#endif -#ifndef _VOLUME_H_ + #include "core/volume.h" -#endif -#ifndef _MATERIALFEATUREDATA_H_ + #include "materials/materialFeatureData.h" -#endif /// Base class used by shaderGen to be API agnostic. Subclasses implement the various methods /// in an API specific way. diff --git a/Engine/source/shaderGen/shaderGenVars.h b/Engine/source/shaderGen/shaderGenVars.h index 0a1fb5310..d328dbe95 100644 --- a/Engine/source/shaderGen/shaderGenVars.h +++ b/Engine/source/shaderGen/shaderGenVars.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 _SHADERGENVARS_H_ #define _SHADERGENVARS_H_ - -#ifndef _TORQUE_STRING_H_ #include "core/util/str.h" -#endif /// /// ShaderGenVars, predefined string names for variables that shadergen based shaders use, this avoids diff --git a/Engine/source/shaderGen/shaderOp.h b/Engine/source/shaderGen/shaderOp.h index 6b8966250..a14422d05 100644 --- a/Engine/source/shaderGen/shaderOp.h +++ b/Engine/source/shaderGen/shaderOp.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 _SHADEROP_H_ #define _SHADEROP_H_ - -#ifndef _LANG_ELEMENT_H_ #include "shaderGen/langElement.h" -#endif //************************************************************************** /*! diff --git a/Engine/source/sim/actionMap.h b/Engine/source/sim/actionMap.h index 3a8ff392e..4855b0f2e 100644 --- a/Engine/source/sim/actionMap.h +++ b/Engine/source/sim/actionMap.h @@ -19,22 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _ACTIONMAP_H_ -#define _ACTIONMAP_H_ - -#ifndef _PLATFORM_H_ +#pragma once + #include "platform/platform.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif -#ifndef _ITICKABLE_H_ + #include "core/iTickable.h" -#endif class ContextAction; struct InputEventInfo; @@ -218,4 +211,4 @@ public: void interpolateTick(F32 delta) override {} void advanceTime(F32 timeDelta) override {} }; -#endif // _ACTIONMAP_H_ + diff --git a/Engine/source/sim/netConnection.h b/Engine/source/sim/netConnection.h index 770e40dd9..ea70de929 100644 --- a/Engine/source/sim/netConnection.h +++ b/Engine/source/sim/netConnection.h @@ -24,22 +24,18 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _NETCONNECTION_H_ #define _NETCONNECTION_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _NETOBJECT_H_ + #include "sim/netObject.h" -#endif -#ifndef _NETSTRINGTABLE_H_ + #include "sim/netStringTable.h" -#endif -#ifndef _DNET_H_ + #include "core/dnet.h" -#endif #ifndef _H_CONNECTIONSTRINGTABLE #include "sim/connectionStringTable.h" diff --git a/Engine/source/sim/netObject.h b/Engine/source/sim/netObject.h index 0bed12612..e6ecc67e8 100644 --- a/Engine/source/sim/netObject.h +++ b/Engine/source/sim/netObject.h @@ -24,17 +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 _NETOBJECT_H_ #define _NETOBJECT_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _MMATH_H_ -#include "math/mMath.h" -#endif +#include "math/mMath.h" //----------------------------------------------------------------------------- class NetConnection; diff --git a/Engine/source/sim/netStringTable.h b/Engine/source/sim/netStringTable.h index a3cc9f530..992a7dd31 100644 --- a/Engine/source/sim/netStringTable.h +++ b/Engine/source/sim/netStringTable.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 _NETSTRINGTABLE_H_ #define _NETSTRINGTABLE_H_ - -#ifndef _DATACHUNKER_H_ #include "core/dataChunker.h" -#endif -#ifndef _CONSOLE_H_ + #include "console/console.h" -#endif class NetConnection; diff --git a/Engine/source/terrain/glsl/terrFeatureGLSL.h b/Engine/source/terrain/glsl/terrFeatureGLSL.h index 7c80773ec..22dadc333 100644 --- a/Engine/source/terrain/glsl/terrFeatureGLSL.h +++ b/Engine/source/terrain/glsl/terrFeatureGLSL.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 _TERRFEATUREGLSL_H_ #define _TERRFEATUREGLSL_H_ - -#ifndef _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_ #include "shaderGen/GLSL/shaderFeatureGLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ -#include "shaderGen/langElement.h" -#endif +#include "shaderGen/langElement.h" /// A shared base class for terrain features which /// includes some helper functions. diff --git a/Engine/source/terrain/hlsl/terrFeatureHLSL.h b/Engine/source/terrain/hlsl/terrFeatureHLSL.h index b65b1335b..5c50f8f97 100644 --- a/Engine/source/terrain/hlsl/terrFeatureHLSL.h +++ b/Engine/source/terrain/hlsl/terrFeatureHLSL.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 _TERRFEATUREHLSL_H_ #define _TERRFEATUREHLSL_H_ - -#ifndef _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_ #include "shaderGen/HLSL/shaderFeatureHLSL.h" -#endif -#ifndef _LANG_ELEMENT_H_ -#include "shaderGen/langElement.h" -#endif +#include "shaderGen/langElement.h" /// A shared base class for terrain features which /// includes some helper functions. diff --git a/Engine/source/terrain/terrCell.h b/Engine/source/terrain/terrCell.h index 0b948cedd..ce97797b4 100644 --- a/Engine/source/terrain/terrCell.h +++ b/Engine/source/terrain/terrCell.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 _TERRCELL_H_ #define _TERRCELL_H_ - -#ifndef _GFXVERTEXBUFFER_H_ #include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _TDICTIONARY_H_ + #include "core/util/tDictionary.h" -#endif -#ifndef _MORIENTEDBOX_H_ + #include "math/mOrientedBox.h" -#endif -#ifndef _BITVECTOR_H_ + #include "core/bitVector.h" -#endif class TerrainBlock; class TerrainCellMaterial; diff --git a/Engine/source/terrain/terrCellMaterial.h b/Engine/source/terrain/terrCellMaterial.h index c8e6fc05e..24e154885 100644 --- a/Engine/source/terrain/terrCellMaterial.h +++ b/Engine/source/terrain/terrCellMaterial.h @@ -19,26 +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 _TERRCELLMATERIAL_H_ #define _TERRCELLMATERIAL_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif -#ifndef _MATTEXTURETARGET_H_ -#include "materials/matTextureTarget.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ -#include "gfx/gfxTextureHandle.h" -#endif -#ifndef _GFXSHADER_H_ -#include "gfx/gfxShader.h" -#endif -#ifndef _GFXSTATEBLOCK_H_ -#include "gfx/gfxStateBlock.h" -#endif +#include "materials/matTextureTarget.h" + +#include "gfx/gfxTextureHandle.h" + +#include "gfx/gfxShader.h" + +#include "gfx/gfxStateBlock.h" class GFXTextureArray; class SceneRenderState; diff --git a/Engine/source/terrain/terrCollision.h b/Engine/source/terrain/terrCollision.h index 6434a3a91..25338a458 100644 --- a/Engine/source/terrain/terrCollision.h +++ b/Engine/source/terrain/terrCollision.h @@ -19,14 +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 _TERRCOLL_H_ #define _TERRCOLL_H_ - -#ifndef _CONVEX_H_ #include "collision/convex.h" -#endif - class TerrainConvex : public Convex { diff --git a/Engine/source/terrain/terrData.h b/Engine/source/terrain/terrData.h index ebbe099c1..bcb139069 100644 --- a/Engine/source/terrain/terrData.h +++ b/Engine/source/terrain/terrData.h @@ -24,41 +24,31 @@ // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames // Copyright (C) 2015 Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _TERRDATA_H_ #define _TERRDATA_H_ - -#ifndef _MPOINT3_H_ #include "math/mPoint3.h" -#endif -#ifndef _SCENEOBJECT_H_ + #include "scene/sceneObject.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif -#ifndef _RENDERPASSMANAGER_H_ #include "renderInstance/renderPassManager.h" -#endif -#ifndef _TSIGNAL_H_ -#include "core/util/tSignal.h" -#endif -#ifndef _TERRFILE_H_ -#include "terrain/terrFile.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ -#include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _ASSET_PTR_H_ +#include "core/util/tSignal.h" + +#include "terrain/terrFile.h" + +#include "gfx/gfxPrimitiveBuffer.h" #include "assets/assetPtr.h" -#endif + #ifndef TERRAINASSET_H #include "T3D/assets/TerrainAsset.h" #endif -#ifndef _CONVEX_H_ #include "collision/convex.h" -#endif class GBitmap; class TerrainBlock; diff --git a/Engine/source/terrain/terrFeatureTypes.h b/Engine/source/terrain/terrFeatureTypes.h index 825758af9..8b4e5742b 100644 --- a/Engine/source/terrain/terrFeatureTypes.h +++ b/Engine/source/terrain/terrFeatureTypes.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 _TERRFEATURETYPES_H_ #define _TERRFEATURETYPES_H_ - -#ifndef _FEATURETYPE_H_ #include "shaderGen/featureType.h" -#endif DeclareFeatureType( MFT_TerrainBaseMap ); DeclareFeatureType( MFT_TerrainMacroMap ); diff --git a/Engine/source/terrain/terrFile.h b/Engine/source/terrain/terrFile.h index 568184aac..1aac4d5c1 100644 --- a/Engine/source/terrain/terrFile.h +++ b/Engine/source/terrain/terrFile.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 _TERRFILE_H_ #define _TERRFILE_H_ - -#ifndef _TVECTOR_H_ #include -#endif -#ifndef _PATH_H_ + #include -#endif -#ifndef _MATERIALLIST_H_ + #include "materials/materialList.h" -#endif -#ifndef _TERRMATERIAL_H_ + #include "terrain/terrMaterial.h" -#endif class TerrainMaterial; class FileStream; diff --git a/Engine/source/terrain/terrMaterial.h b/Engine/source/terrain/terrMaterial.h index 19c712128..6467aef5f 100644 --- a/Engine/source/terrain/terrMaterial.h +++ b/Engine/source/terrain/terrMaterial.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 _TERRMATERIAL_H_ #define _TERRMATERIAL_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif #include "T3D/assets/ImageAsset.h" diff --git a/Engine/source/terrain/terrRender.h b/Engine/source/terrain/terrRender.h index ea67c0ca2..3f8c3feaa 100644 --- a/Engine/source/terrain/terrRender.h +++ b/Engine/source/terrain/terrRender.h @@ -29,13 +29,12 @@ // code. Structures EmitChunk and SquareStackNode now contain an // afxZodiacBitmask for keeping track of zodiac intersections. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// +#pragma once +#pragma once #ifndef _TERRRENDER_H_ #define _TERRRENDER_H_ - -#ifndef _TERRDATA_H_ #include "terrain/terrData.h" -#endif #include "afx/ce/afxZodiacDefs.h" enum TerrConstants : U32 diff --git a/Engine/source/ts/arch/tsMeshIntrinsics.arch.h b/Engine/source/ts/arch/tsMeshIntrinsics.arch.h index 04bb9d795..846a198af 100644 --- a/Engine/source/ts/arch/tsMeshIntrinsics.arch.h +++ b/Engine/source/ts/arch/tsMeshIntrinsics.arch.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 _TSMESHINTRINSICS_ARCH_H_ #define _TSMESHINTRINSICS_ARCH_H_ diff --git a/Engine/source/ts/assimp/assimpAppMaterial.h b/Engine/source/ts/assimp/assimpAppMaterial.h index 4b80b5430..9fa830f41 100644 --- a/Engine/source/ts/assimp/assimpAppMaterial.h +++ b/Engine/source/ts/assimp/assimpAppMaterial.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 _ASSIMP_APPMATERIAL_H_ #define _ASSIMP_APPMATERIAL_H_ - -#ifndef _APPMATERIAL_H_ #include "ts/loader/appMaterial.h" -#endif #if !defined(TORQUE_DISABLE_MEMORY_MANAGER) #ifdef new diff --git a/Engine/source/ts/assimp/assimpAppMesh.h b/Engine/source/ts/assimp/assimpAppMesh.h index 48c1cfc34..4c33de6a9 100644 --- a/Engine/source/ts/assimp/assimpAppMesh.h +++ b/Engine/source/ts/assimp/assimpAppMesh.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 #ifndef _ASSIMP_APPMESH_H_ #define _ASSIMP_APPMESH_H_ - -#ifndef _APPMESH_H_ #include "ts/loader/appMesh.h" -#endif -#ifndef _TSSHAPELOADER_H_ + #include "ts/loader/tsShapeLoader.h" -#endif -#ifndef _ASSIMP_APPNODE_H_ #include "ts/assimp/assimpAppNode.h" -#endif class AssimpAppMesh : public AppMesh { diff --git a/Engine/source/ts/assimp/assimpAppNode.h b/Engine/source/ts/assimp/assimpAppNode.h index 62c7e0c49..eafb77214 100644 --- a/Engine/source/ts/assimp/assimpAppNode.h +++ b/Engine/source/ts/assimp/assimpAppNode.h @@ -19,20 +19,14 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _ASSIMP_APPNODE_H_ #define _ASSIMP_APPNODE_H_ +#include "core/util/tDictionary.h" -#ifndef _TDICTIONARY_H_ -#include "core/tDictionary.h" -#endif -#ifndef _APPNODE_H_ #include "ts/loader/appNode.h" -#endif -#ifndef _COLLADA_EXTENSIONS_H_ #include "ts/collada/colladaExtensions.h" -#endif - #if !defined(TORQUE_DISABLE_MEMORY_MANAGER) #ifdef new diff --git a/Engine/source/ts/assimp/assimpAppSequence.h b/Engine/source/ts/assimp/assimpAppSequence.h index 5468e1ce0..ee29f94ca 100644 --- a/Engine/source/ts/assimp/assimpAppSequence.h +++ b/Engine/source/ts/assimp/assimpAppSequence.h @@ -1,22 +1,15 @@ #pragma once -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _TSSHAPE_H_ + #include "ts/tsShape.h" -#endif -#ifndef _APPNODE_H_ + #include "ts/loader/appNode.h" -#endif -#ifndef _APPMESH_H_ + #include "ts/loader/appMesh.h" -#endif -#ifndef _APPSEQUENCE_H_ + #include "ts/loader/appSequence.h" -#endif #if !defined(TORQUE_DISABLE_MEMORY_MANAGER) #ifdef new diff --git a/Engine/source/ts/assimp/assimpShapeLoader.h b/Engine/source/ts/assimp/assimpShapeLoader.h index 37c4aa308..e60b46ecb 100644 --- a/Engine/source/ts/assimp/assimpShapeLoader.h +++ b/Engine/source/ts/assimp/assimpShapeLoader.h @@ -19,18 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _ASSIMP_SHAPELOADER_H_ #define _ASSIMP_SHAPELOADER_H_ - -#ifndef _TSSHAPELOADER_H_ #include "ts/loader/tsShapeLoader.h" -#endif - - -#ifndef _ASSIMP_APPNODE_H_ #include "ts/assimp/assimpAppNode.h" -#endif #include #include diff --git a/Engine/source/ts/collada/colladaAppMaterial.h b/Engine/source/ts/collada/colladaAppMaterial.h index 76fc6f434..e769c9d33 100644 --- a/Engine/source/ts/collada/colladaAppMaterial.h +++ b/Engine/source/ts/collada/colladaAppMaterial.h @@ -19,16 +19,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _COLLADA_APP_MATERIAL_H_ #define _COLLADA_APP_MATERIAL_H_ - -#ifndef _APPMATERIAL_H_ #include "ts/loader/appMaterial.h" -#endif -#ifndef _COLLADA_EXTENSIONS_H_ #include "ts/collada/colladaExtensions.h" -#endif class Material; diff --git a/Engine/source/ts/collada/colladaAppMesh.h b/Engine/source/ts/collada/colladaAppMesh.h index 6b737a9b9..68c74d3c8 100644 --- a/Engine/source/ts/collada/colladaAppMesh.h +++ b/Engine/source/ts/collada/colladaAppMesh.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 #ifndef _COLLADA_APPMESH_H_ #define _COLLADA_APPMESH_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _APPMESH_H_ + #include "ts/loader/appMesh.h" -#endif -#ifndef _TSSHAPELOADER_H_ + #include "ts/loader/tsShapeLoader.h" -#endif -#ifndef _COLLADA_APPNODE_H_ #include "ts/collada/colladaAppNode.h" -#endif -#ifndef _COLLADA_EXTENSIONS_H_ + #include "ts/collada/colladaExtensions.h" -#endif //----------------------------------------------------------------------------- // Torque unifies the vert position, normal and UV values, so that a single index diff --git a/Engine/source/ts/collada/colladaAppNode.h b/Engine/source/ts/collada/colladaAppNode.h index b67b581d8..931dfb71e 100644 --- a/Engine/source/ts/collada/colladaAppNode.h +++ b/Engine/source/ts/collada/colladaAppNode.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 #ifndef _COLLADA_APPNODE_H_ #define _COLLADA_APPNODE_H_ - -#ifndef _TDICTIONARY_H_ #include "core/util/tDictionary.h" -#endif -#ifndef _APPNODE_H_ + #include "ts/loader/appNode.h" -#endif -#ifndef _COLLADA_EXTENSIONS_H_ #include "ts/collada/colladaExtensions.h" -#endif class ColladaAppNode : public AppNode { diff --git a/Engine/source/ts/collada/colladaAppSequence.h b/Engine/source/ts/collada/colladaAppSequence.h index fcb9d4e84..2b8085c80 100644 --- a/Engine/source/ts/collada/colladaAppSequence.h +++ b/Engine/source/ts/collada/colladaAppSequence.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 _COLLADA_APPSEQUENCE_H_ #define _COLLADA_APPSEQUENCE_H_ - -#ifndef _APPSEQUENCE_H_ #include "ts/loader/appSequence.h" -#endif class domAnimation_clip; class ColladaExtension_animation_clip; diff --git a/Engine/source/ts/collada/colladaExtensions.h b/Engine/source/ts/collada/colladaExtensions.h index 50dae907c..cd69a4669 100644 --- a/Engine/source/ts/collada/colladaExtensions.h +++ b/Engine/source/ts/collada/colladaExtensions.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 _COLLADA_EXTENSIONS_H_ #define _COLLADA_EXTENSIONS_H_ - -#ifndef _TSSHAPE_LOADER_H_ #include "ts/loader/tsShapeLoader.h" -#endif -#ifndef _COLLADA_UTILS_H_ + #include "ts/collada/colladaUtils.h" -#endif //----------------------------------------------------------------------------- // Collada allows custom data to be included with many elements using the diff --git a/Engine/source/ts/collada/colladaShapeLoader.h b/Engine/source/ts/collada/colladaShapeLoader.h index 780b403db..4c5874b89 100644 --- a/Engine/source/ts/collada/colladaShapeLoader.h +++ b/Engine/source/ts/collada/colladaShapeLoader.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 _COLLADA_SHAPELOADER_H_ #define _COLLADA_SHAPELOADER_H_ - -#ifndef _TSSHAPELOADER_H_ #include "ts/loader/tsShapeLoader.h" -#endif class domCOLLADA; class domAnimation; diff --git a/Engine/source/ts/collada/colladaUtils.h b/Engine/source/ts/collada/colladaUtils.h index 102af0da3..1d0682bb0 100644 --- a/Engine/source/ts/collada/colladaUtils.h +++ b/Engine/source/ts/collada/colladaUtils.h @@ -19,40 +19,27 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - -#ifndef _COLLADA_UTILS_H_ -#define _COLLADA_UTILS_H_ +#pragma once #ifdef _MSC_VER #pragma warning(disable : 4786) // disable warning about long debug symbol names #pragma warning(disable : 4355) // disable "'this' : used in base member initializer list" warnings #endif - -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _MQUAT_H_ + #include "math/mQuat.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _TSSHAPE_LOADER_H_ #include "ts/loader/tsShapeLoader.h" -#endif -#ifndef _OPTIMIZEDPOLYLIST_H_ + #include "collision/optimizedPolyList.h" -#endif + #ifndef TINYXML2_INCLUDED #include "tinyxml2.h" #endif -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif -#ifndef _TSSHAPEINSTANCE_H_ #include "ts/tsShapeInstance.h" -#endif #include "platform/tmm_off.h" @@ -982,5 +969,3 @@ typedef AnimatedElement AnimatedBool; typedef AnimatedElement AnimatedInt; typedef AnimatedElement AnimatedString; typedef AnimatedElementList AnimatedFloatList; - -#endif // _COLLADA_UTILS_H_ diff --git a/Engine/source/ts/instancingMatHook.h b/Engine/source/ts/instancingMatHook.h index 0c3c3a952..265195dca 100644 --- a/Engine/source/ts/instancingMatHook.h +++ b/Engine/source/ts/instancingMatHook.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 _INSTANCINGMATHOOK_H_ #define _INSTANCINGMATHOOK_H_ - -#ifndef _MATINSTANCEHOOK_H_ #include "materials/matInstanceHook.h" -#endif class BaseMatInstance; diff --git a/Engine/source/ts/loader/appMaterial.h b/Engine/source/ts/loader/appMaterial.h index 30032654f..d72492f2f 100644 --- a/Engine/source/ts/loader/appMaterial.h +++ b/Engine/source/ts/loader/appMaterial.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 _APPMATERIAL_H_ #define _APPMATERIAL_H_ diff --git a/Engine/source/ts/loader/appMesh.h b/Engine/source/ts/loader/appMesh.h index 363b67421..e9a5041c6 100644 --- a/Engine/source/ts/loader/appMesh.h +++ b/Engine/source/ts/loader/appMesh.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 _APPMESH_H_ #define _APPMESH_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _APPMATERIAL_H_ + #include "ts/loader/appMaterial.h" -#endif -#ifndef _APPSEQUENCE_H_ + #include "ts/loader/appSequence.h" -#endif class AppNode; diff --git a/Engine/source/ts/loader/appNode.h b/Engine/source/ts/loader/appNode.h index 65ef92e40..5fb1bfaa6 100644 --- a/Engine/source/ts/loader/appNode.h +++ b/Engine/source/ts/loader/appNode.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 _APPNODE_H_ #define _APPNODE_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _APPMESH_H_ + #include "ts/loader/appMesh.h" -#endif class AppNode { diff --git a/Engine/source/ts/loader/appSequence.h b/Engine/source/ts/loader/appSequence.h index f5fdfae12..fa678c360 100644 --- a/Engine/source/ts/loader/appSequence.h +++ b/Engine/source/ts/loader/appSequence.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 _APPSEQUENCE_H_ #define _APPSEQUENCE_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _TSSHAPE_H_ + #include "ts/tsShape.h" -#endif class AppSequence { diff --git a/Engine/source/ts/loader/tsShapeLoader.h b/Engine/source/ts/loader/tsShapeLoader.h index bda7fa34b..dfe171d86 100644 --- a/Engine/source/ts/loader/tsShapeLoader.h +++ b/Engine/source/ts/loader/tsShapeLoader.h @@ -19,28 +19,21 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once #ifndef _TSSHAPE_LOADER_H_ #define _TSSHAPE_LOADER_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _TSSHAPE_H_ + #include "ts/tsShape.h" -#endif -#ifndef _APPNODE_H_ + #include "ts/loader/appNode.h" -#endif -#ifndef _APPMESH_H_ + #include "ts/loader/appMesh.h" -#endif -#ifndef _APPSEQUENCE_H_ + #include "ts/loader/appSequence.h" -#endif class TSShapeLoader { diff --git a/Engine/source/ts/tsDecal.h b/Engine/source/ts/tsDecal.h index 7715850f6..418f0c70d 100644 --- a/Engine/source/ts/tsDecal.h +++ b/Engine/source/ts/tsDecal.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 _TSDECAL_H_ #define _TSDECAL_H_ - -#ifndef _TSMESH_H_ #include "ts/tsMesh.h" -#endif /// Decals! The lovely detailing thingies, e.g. bullet hole marks. /// DEPRECATED: This class is here for compatibility with old files only. diff --git a/Engine/source/ts/tsIntegerSet.h b/Engine/source/ts/tsIntegerSet.h index ab5098f01..284d7bc10 100644 --- a/Engine/source/ts/tsIntegerSet.h +++ b/Engine/source/ts/tsIntegerSet.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 _TSINTEGERSET_H_ #define _TSINTEGERSET_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _TVECTOR_H_ -#include "core/util/tVector.h" -#endif +#include "core/util/tVector.h" #if defined(TORQUE_MAX_LIB) #define MAX_TS_SET_DWORDS 32 diff --git a/Engine/source/ts/tsLastDetail.h b/Engine/source/ts/tsLastDetail.h index 05e3c9dcb..6f885525f 100644 --- a/Engine/source/ts/tsLastDetail.h +++ b/Engine/source/ts/tsLastDetail.h @@ -19,35 +19,27 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _TSLASTDETAIL_H_ #define _TSLASTDETAIL_H_ - -#ifndef _MATHTYPES_H_ #include "math/mathTypes.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MMATRIX_H_ + #include "math/mMatrix.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif + #ifndef __RESOURCE_H__ #include "core/resource.h" #endif -#ifndef _TSRENDERDATA_H_ #include "ts/tsRenderState.h" -#endif -#ifndef _GFXVERTEXFORMAT_H_ -#include "gfx/gfxVertexFormat.h" -#endif -#ifndef _SIM_H_ -#include "console/simObject.h" -#endif +#include "gfx/gfxVertexFormat.h" + +#include "console/simObject.h" class TSShape; class TSRenderState; diff --git a/Engine/source/ts/tsMaterialList.h b/Engine/source/ts/tsMaterialList.h index ed40b56cc..af6256ec2 100644 --- a/Engine/source/ts/tsMaterialList.h +++ b/Engine/source/ts/tsMaterialList.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 _TSMATERIALLIST_H_ #define _TSMATERIALLIST_H_ - -#ifndef _MATERIALLIST_H_ #include "materials/materialList.h" -#endif -#ifndef _PATH_H_ -#include "core/util/path.h" -#endif +#include "core/util/path.h" /// Specialized material list for 3space objects. class TSMaterialList : public MaterialList diff --git a/Engine/source/ts/tsMesh.h b/Engine/source/ts/tsMesh.h index 171b72282..8f9fd4ca8 100644 --- a/Engine/source/ts/tsMesh.h +++ b/Engine/source/ts/tsMesh.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 _TSMESH_H_ #define _TSMESH_H_ - -#ifndef _STREAM_H_ #include "core/stream/stream.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _ABSTRACTPOLYLIST_H_ + #include "collision/abstractPolyList.h" -#endif -#ifndef _GFXDEVICE_H_ + #include "gfx/gfxDevice.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ + #include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _TSPARSEARRAY_H_ + #include "core/tSparseArray.h" -#endif #include "core/util/safeDelete.h" diff --git a/Engine/source/ts/tsMeshIntrinsics.h b/Engine/source/ts/tsMeshIntrinsics.h index 40b01416f..d49903b13 100644 --- a/Engine/source/ts/tsMeshIntrinsics.h +++ b/Engine/source/ts/tsMeshIntrinsics.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 _TSMESHINTRINSICS_H_ #define _TSMESHINTRINSICS_H_ diff --git a/Engine/source/ts/tsPartInstance.h b/Engine/source/ts/tsPartInstance.h index ef523d6a0..47d51526c 100644 --- a/Engine/source/ts/tsPartInstance.h +++ b/Engine/source/ts/tsPartInstance.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 _TSPARTINSTANCE_H_ #define _TSPARTINSTANCE_H_ - -#ifndef _TSSHAPEINSTANCE_H_ #include "ts/tsShapeInstance.h" -#endif class TSPartInstance { diff --git a/Engine/source/ts/tsRenderState.h b/Engine/source/ts/tsRenderState.h index e30c50b6e..30e806a3b 100644 --- a/Engine/source/ts/tsRenderState.h +++ b/Engine/source/ts/tsRenderState.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 _TSRENDERDATA_H_ #define _TSRENDERDATA_H_ - -#ifndef _MMATRIX_H_ #include "math/mMatrix.h" -#endif -#ifndef _GFXDEVICE_H_ #include "gfx/gfxDevice.h" -#endif -#ifndef _BASEMATINSTANCE_H_ #include "materials/baseMatInstance.h" -#endif class SceneRenderState; class GFXCubemap; diff --git a/Engine/source/ts/tsShape.h b/Engine/source/ts/tsShape.h index 733a36008..1479cfed2 100644 --- a/Engine/source/ts/tsShape.h +++ b/Engine/source/ts/tsShape.h @@ -19,23 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once -#ifndef _TSSHAPE_H_ -#define _TSSHAPE_H_ - -#ifndef _TSMESH_H_ #include "ts/tsMesh.h" -#endif -#ifndef _TSINTEGERSET_H_ -#include "ts/tsIntegerSet.h" -#endif -#ifndef _TSTRANSFORM_H_ -#include "ts/tsTransform.h" -#endif -#ifndef _TSSHAPEALLOC_H_ -#include "ts/tsShapeAlloc.h" -#endif +#include "ts/tsIntegerSet.h" + +#include "ts/tsTransform.h" + +#include "ts/tsShapeAlloc.h" #define DTS_EXPORTER_CURRENT_VERSION 124 @@ -765,5 +757,3 @@ inline const TSShape::ObjectState & TSShape::getObjectState(const Sequence & seq { return objectStates[seq.baseObjectState + objectNum*seq.numKeyframes + keyframeNum]; } - -#endif diff --git a/Engine/source/ts/tsShapeAlloc.h b/Engine/source/ts/tsShapeAlloc.h index 562e7d79f..fc09ab595 100644 --- a/Engine/source/ts/tsShapeAlloc.h +++ b/Engine/source/ts/tsShapeAlloc.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 _TSSHAPEALLOC_H_ #define _TSSHAPEALLOC_H_ - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif /// Alloc structure used in the reading/writing of shapes. /// diff --git a/Engine/source/ts/tsShapeConstruct.h b/Engine/source/ts/tsShapeConstruct.h index f4f8dfbff..a7f6f4fda 100644 --- a/Engine/source/ts/tsShapeConstruct.h +++ b/Engine/source/ts/tsShapeConstruct.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 _TSSHAPECONSTRUCT_H_ #define _TSSHAPECONSTRUCT_H_ @@ -26,21 +28,14 @@ #ifndef __RESOURCE_H__ #include "core/resource.h" #endif -#ifndef _MTRANSFORM_H_ #include "math/mTransform.h" -#endif -#ifndef _TSSHAPE_H_ + #include "ts/tsShape.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif -#ifndef _COLLADA_UTILS_H_ #include "ts/collada/colladaUtils.h" -#endif -#ifndef _ENGINEAPI_H_ + #include "console/engineAPI.h" -#endif #include "T3D/assets/ShapeAsset.h" #include "T3D/assets/ShapeAnimationAsset.h" diff --git a/Engine/source/ts/tsShapeInstance.h b/Engine/source/ts/tsShapeInstance.h index 78ed5e641..e62bc4a1b 100644 --- a/Engine/source/ts/tsShapeInstance.h +++ b/Engine/source/ts/tsShapeInstance.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 _TSSHAPEINSTANCE_H_ #define _TSSHAPEINSTANCE_H_ @@ -31,24 +33,17 @@ #ifndef __RESOURCE_H__ #include "core/resource.h" #endif -#ifndef _TSSHAPE_H_ #include "ts/tsShape.h" -#endif -#ifndef _TSINTEGERSET_H_ + #include "ts/tsIntegerSet.h" -#endif -#ifndef _CONSOLE_H_ + #include "console/console.h" -#endif -#ifndef _GBITMAP_H_ + #include "gfx/bitmap/gBitmap.h" -#endif -#ifndef _TSRENDERDATA_H_ + #include "ts/tsRenderState.h" -#endif -#ifndef _TSMATERIALLIST_H_ + #include "ts/tsMaterialList.h" -#endif class RenderItem; class TSThread; diff --git a/Engine/source/ts/tsSortedMesh.h b/Engine/source/ts/tsSortedMesh.h index 26dc18621..08a318f4b 100644 --- a/Engine/source/ts/tsSortedMesh.h +++ b/Engine/source/ts/tsSortedMesh.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 _TSSORTEDMESH_H_ #define _TSSORTEDMESH_H_ - -#ifndef _TSMESH_H_ #include "ts/tsMesh.h" -#endif /// TSSortedMesh is for meshes that need sorting (obviously). Such meshes /// are usually partially or completely composed of translucent/parent polygons. diff --git a/Engine/source/ts/tsTransform.h b/Engine/source/ts/tsTransform.h index 7c7139fea..69b03f625 100644 --- a/Engine/source/ts/tsTransform.h +++ b/Engine/source/ts/tsTransform.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 _TSTRANSFORM_H_ #define _TSTRANSFORM_H_ - -#ifndef _MMATH_H_ #include "math/mMath.h" -#endif class Stream; diff --git a/Engine/source/util/catmullRom.h b/Engine/source/util/catmullRom.h index 40d7d2eaa..cdc4d94e2 100644 --- a/Engine/source/util/catmullRom.h +++ b/Engine/source/util/catmullRom.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 _CATMULLROM_H_ #define _CATMULLROM_H_ diff --git a/Engine/source/util/fpsTracker.h b/Engine/source/util/fpsTracker.h index a29fbbecf..5309ff986 100644 --- a/Engine/source/util/fpsTracker.h +++ b/Engine/source/util/fpsTracker.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 _UTIL_FPSTRACKER_H_ #define _UTIL_FPSTRACKER_H_ diff --git a/Engine/source/util/imposterCapture.h b/Engine/source/util/imposterCapture.h index 286e38ab6..d50904a43 100644 --- a/Engine/source/util/imposterCapture.h +++ b/Engine/source/util/imposterCapture.h @@ -19,28 +19,22 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _IMPOSTERCAPTURE_H_ #define _IMPOSTERCAPTURE_H_ - -#ifndef _MATHTYPES_H_ #include "math/mathTypes.h" -#endif -#ifndef _MPOINT3_H_ + #include "math/mPoint3.h" -#endif -#ifndef _MMATRIX_H_ + #include "math/mMatrix.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _TSRENDERDATA_H_ + #include "ts/tsRenderState.h" -#endif -#ifndef _GFXTEXTUREHANDLE_H_ + #include "gfx/gfxTextureHandle.h" -#endif class GBitmap; class SceneRenderState; diff --git a/Engine/source/util/interpolatedChangeProperty.h b/Engine/source/util/interpolatedChangeProperty.h index 120563c9e..4ce6439d9 100644 --- a/Engine/source/util/interpolatedChangeProperty.h +++ b/Engine/source/util/interpolatedChangeProperty.h @@ -19,23 +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 _INTERPOLATEDCHANGEPROPERTY_H_ #define _INTERPOLATEDCHANGEPROPERTY_H_ - -#ifndef _SIM_H_ #include "console/sim.h" -#endif -#ifndef _MEASE_H_ #include "math/mEase.h" -#endif -#ifndef _TIMESOURCE_H_ #include "core/util/timeSource.h" -#endif - - /// A property that smoothly transitions to new values instead of assuming /// them right away. diff --git a/Engine/source/util/messaging/dispatcher.h b/Engine/source/util/messaging/dispatcher.h index 986a3cba1..7795b382f 100644 --- a/Engine/source/util/messaging/dispatcher.h +++ b/Engine/source/util/messaging/dispatcher.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 _DISPATCHER_H_ #define _DISPATCHER_H_ - -#ifndef _MESSAGE_H_ #include "util/messaging/message.h" -#endif -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif /// @addtogroup msgsys Message System // @{ diff --git a/Engine/source/util/messaging/eventManager.h b/Engine/source/util/messaging/eventManager.h index 1e84af84a..cfc44e8d2 100644 --- a/Engine/source/util/messaging/eventManager.h +++ b/Engine/source/util/messaging/eventManager.h @@ -19,22 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _EVENTMANAGER_H_ #define _EVENTMANAGER_H_ - -#ifndef _CONSOLE_H_ #include "console/console.h" -#endif -#ifndef _DISPATCHER_H_ #include "util/messaging/dispatcher.h" -#endif - -#ifndef _TSIMPLEHASHTABLE_H #include "core/tSimpleHashTable.h" -#endif - //----------------------------------------------------------------------------- /// Listener class used by the EventManager to dispatch messages to specific diff --git a/Engine/source/util/messaging/message.h b/Engine/source/util/messaging/message.h index 604361fa7..04c4f5a05 100644 --- a/Engine/source/util/messaging/message.h +++ b/Engine/source/util/messaging/message.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 _MESSAGE_H_ #define _MESSAGE_H_ - -#ifndef _SIMBASE_H_ #include "console/simBase.h" -#endif -#ifndef _NETCONNECTION_H_ #include "sim/netConnection.h" -#endif // Forward Refs class MessageQueue; diff --git a/Engine/source/util/messaging/messageForwarder.h b/Engine/source/util/messaging/messageForwarder.h index 3ac8d7ab1..f2efad6b6 100644 --- a/Engine/source/util/messaging/messageForwarder.h +++ b/Engine/source/util/messaging/messageForwarder.h @@ -23,6 +23,8 @@ #include "console/simBase.h" #include "util/messaging/dispatcher.h" #include "util/messaging/scriptMsgListener.h" +#pragma once +#pragma once #ifndef _MESSAGEFORWARDER_H_ #define _MESSAGEFORWARDER_H_ diff --git a/Engine/source/util/messaging/scriptMsgListener.h b/Engine/source/util/messaging/scriptMsgListener.h index 7cd2a5c23..51e746518 100644 --- a/Engine/source/util/messaging/scriptMsgListener.h +++ b/Engine/source/util/messaging/scriptMsgListener.h @@ -21,13 +21,12 @@ //----------------------------------------------------------------------------- #include "console/simBase.h" +#pragma once +#pragma once #ifndef _SCRIPTMSGLISTENER_H_ #define _SCRIPTMSGLISTENER_H_ - -#ifndef _DISPATCHER_H_ #include "util/messaging/dispatcher.h" -#endif /// @addtogroup msgsys Message System // @{ diff --git a/Engine/source/util/noise2d.h b/Engine/source/util/noise2d.h index 57e302f45..b7e144fb8 100644 --- a/Engine/source/util/noise2d.h +++ b/Engine/source/util/noise2d.h @@ -19,20 +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 _NOISE2D_H_ #define _NOISE2D_H_ - - -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MMATH_H_ + #include "math/mMath.h" -#endif -#ifndef _MRANDOM_H_ + #include "math/mRandom.h" -#endif class Noise2D { diff --git a/Engine/source/util/quadTreeTracer.h b/Engine/source/util/quadTreeTracer.h index 09257d353..b167ce4fb 100644 --- a/Engine/source/util/quadTreeTracer.h +++ b/Engine/source/util/quadTreeTracer.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 _QUADTREETRACER_H_ #define _QUADTREETRACER_H_ diff --git a/Engine/source/util/rectClipper.h b/Engine/source/util/rectClipper.h index c28b185f0..8d59cc56f 100644 --- a/Engine/source/util/rectClipper.h +++ b/Engine/source/util/rectClipper.h @@ -19,18 +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 _RECTCLIPPER_H_ #define _RECTCLIPPER_H_ //Includes -#ifndef _PLATFORM_H_ #include "platform/platform.h" -#endif -#ifndef _MRECT_H_ -#include "math/mRect.h" -#endif +#include "math/mRect.h" class RectClipper { diff --git a/Engine/source/util/returnType.h b/Engine/source/util/returnType.h index f52aed270..a55aab618 100644 --- a/Engine/source/util/returnType.h +++ b/Engine/source/util/returnType.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 _UTIL_RETURNTYPE_H_ #define _UTIL_RETURNTYPE_H_ diff --git a/Engine/source/util/sampler.h b/Engine/source/util/sampler.h index 7ce8d2bb2..c8abc3eb1 100644 --- a/Engine/source/util/sampler.h +++ b/Engine/source/util/sampler.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 _SAMPLER_H_ #define _SAMPLER_H_ diff --git a/Engine/source/util/scopeTracker.h b/Engine/source/util/scopeTracker.h index ecbf0fac9..7ac5b4086 100644 --- a/Engine/source/util/scopeTracker.h +++ b/Engine/source/util/scopeTracker.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 _SCOPETRACKER_H_ #define _SCOPETRACKER_H_ diff --git a/Engine/source/util/settings.h b/Engine/source/util/settings.h index 41d5a2f84..d4fafdf9f 100644 --- a/Engine/source/util/settings.h +++ b/Engine/source/util/settings.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 _SETTINGS_H_ #define _SETTINGS_H_ diff --git a/Engine/source/util/tempAlloc.h b/Engine/source/util/tempAlloc.h index 40d9a222f..8280971f3 100644 --- a/Engine/source/util/tempAlloc.h +++ b/Engine/source/util/tempAlloc.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 _TEMPALLOC_H_ #define _TEMPALLOC_H_ diff --git a/Engine/source/util/triBoxCheck.h b/Engine/source/util/triBoxCheck.h index ede5d995d..99f8ecfee 100644 --- a/Engine/source/util/triBoxCheck.h +++ b/Engine/source/util/triBoxCheck.h @@ -21,12 +21,14 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// AABB-triangle overlap test code originally by Tomas Akenine-Möller +// AABB-triangle overlap test code originally by Tomas Akenine-Möller // Assisted by Pierre Terdiman and David Hunt // http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/ // Ported to TSE by BJG, 2005-4-14 // Modified to avoid a lot of copying by ASM, 2007-9-28 //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _TRIBOXCHECK_H_ #define _TRIBOXCHECK_H_ diff --git a/Engine/source/util/triRayCheck.h b/Engine/source/util/triRayCheck.h index adf746053..299845e2f 100644 --- a/Engine/source/util/triRayCheck.h +++ b/Engine/source/util/triRayCheck.h @@ -21,11 +21,13 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// Ray to triangle intersection test code originally by Tomas Akenine-Möller +// Ray to triangle intersection test code originally by Tomas Akenine-Möller // and Ben Trumbore. // http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/ // Ported to TGE by DAW, 2005-7-15 //----------------------------------------------------------------------------- +#pragma once +#pragma once #ifndef _TRIRAYCHECK_H_ #define _TRIRAYCHECK_H_ diff --git a/Engine/source/util/undo.h b/Engine/source/util/undo.h index caf856c60..8345c76be 100644 --- a/Engine/source/util/undo.h +++ b/Engine/source/util/undo.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 _UNDO_H_ #define _UNDO_H_ - -#ifndef _SIMOBJECT_H_ #include "console/simObject.h" -#endif -#ifndef _TVECTOR_H_ + #include "core/util/tVector.h" -#endif -#ifndef _SIMBASE_H_ + #include "console/simBase.h" -#endif -#ifndef _ENGINEAPI_H_ + #include "console/engineAPI.h" -#endif class UndoManager; diff --git a/Engine/source/windowManager/platformCursorController.h b/Engine/source/windowManager/platformCursorController.h index 4bd969a5c..0113c092b 100644 --- a/Engine/source/windowManager/platformCursorController.h +++ b/Engine/source/windowManager/platformCursorController.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 _PLATFORMCURSORCONTROLLER_H_ #define _PLATFORMCURSORCONTROLLER_H_ - -#ifndef _TVECTOR_H_ #include "core/util/tVector.h" -#endif class PlatformWindow; diff --git a/Engine/source/windowManager/platformWindow.h b/Engine/source/windowManager/platformWindow.h index 4aa2806e8..65a836cfa 100644 --- a/Engine/source/windowManager/platformWindow.h +++ b/Engine/source/windowManager/platformWindow.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 _WINDOWMANAGER_PLATFORMWINDOW_H_ #define _WINDOWMANAGER_PLATFORMWINDOW_H_ diff --git a/Engine/source/windowManager/platformWindowMgr.h b/Engine/source/windowManager/platformWindowMgr.h index d2279c202..77c65b735 100644 --- a/Engine/source/windowManager/platformWindowMgr.h +++ b/Engine/source/windowManager/platformWindowMgr.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 _PLATFORM_PLATFORMWINDOWMGR_H_ #define _PLATFORM_PLATFORMWINDOWMGR_H_ diff --git a/Engine/source/windowManager/sdl/sdlCursorController.h b/Engine/source/windowManager/sdl/sdlCursorController.h index 66be2f8c3..a42284538 100644 --- a/Engine/source/windowManager/sdl/sdlCursorController.h +++ b/Engine/source/windowManager/sdl/sdlCursorController.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 _SDL_CURSORCONTROLLER_H_ #define _SDL_CURSORCONTROLLER_H_ diff --git a/Engine/source/windowManager/windowInputGenerator.h b/Engine/source/windowManager/windowInputGenerator.h index e10399018..2603f1bb3 100644 --- a/Engine/source/windowManager/windowInputGenerator.h +++ b/Engine/source/windowManager/windowInputGenerator.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 _WINDOW_INPUTGENERATOR_H_ #define _WINDOW_INPUTGENERATOR_H_ diff --git a/Tools/CMake/torque_configs.cmake b/Tools/CMake/torque_configs.cmake index c71fd3a13..c7cfbe27e 100644 --- a/Tools/CMake/torque_configs.cmake +++ b/Tools/CMake/torque_configs.cmake @@ -92,9 +92,9 @@ endif() set(TORQUE_ADDITIONAL_LIBRARY_BINARIES "") # All compile definitions. Modules should append to this if there is any special defines needed. -set(TORQUE_COMPILE_DEFINITIONS ICE_NO_DLL PCRE_STATIC TORQUE_ADVANCED_LIGHTING TORQUE_SHADERGEN - TORQUE_OPCODE TORQUE_ASSIMP TORQUE_SDL TORQUE_COLLADA - TORQUE_UNICODE UNICODE _UNICODE) +set(TORQUE_COMPILE_DEFINITIONS ICE_NO_DLL PCRE_STATIC TORQUE_ADVANCED_LIGHTING TORQUE_SHADERGEN BAN_OPCODE_AUTOLINK _CRT_SECURE_NO_DEPRECATE + TORQUE_OPCODE TORQUE_ASSIMP TORQUE_SDL TORQUE_COLLADA LTC_NO_PROTOTYPES INITGUID NOWINBASEINTERLOCK + TORQUE_UNICODE UNICODE _UNICODE NOMINMAX WIN32_LEAN_AND_MEAN) # All link libraries. Modules should append to this the path to specify additional link libraries (.a, .lib, .dylib, .so) set(TORQUE_LINK_LIBRARIES png_static tinyxml2 collada squish opcode assimp SDL2 glad pcre convexMath zlib) diff --git a/Tools/CMake/torque_macros.cmake b/Tools/CMake/torque_macros.cmake index ca1a65325..000f3958d 100644 --- a/Tools/CMake/torque_macros.cmake +++ b/Tools/CMake/torque_macros.cmake @@ -54,11 +54,11 @@ ENDMACRO() # specified directory then adds them to the TORQUE_SOURCE_FILES variable. macro (torqueAddSourceDirectories) foreach(ARGUMENT ${ARGV}) - file(GLOB SCANNED_SOURCE_FILES "${ARGUMENT}/*.cpp") - file(GLOB SCANNED_INCLUDE_FILES "${ARGUMENT}/*.h") + file(GLOB SCANNED_SOURCE_FILES CONFIGURE_DEPENDS "${ARGUMENT}/*.cpp") + file(GLOB SCANNED_INCLUDE_FILES CONFIGURE_DEPENDS "${ARGUMENT}/*.h") if (APPLE) - file(GLOB SCANNED_MAC_FILES "${ARGUMENT}/*.mm") + file(GLOB SCANNED_MAC_FILES CONFIGURE_DEPENDS "${ARGUMENT}/*.mm") endif (APPLE) # Set in both current and parent scope so this macro can be used from loaded modules