Commit graph

402 commits

Author SHA1 Message Date
Joseph fe9dc1e25b Help from Az finally gave the correct answer to the problem I was trying to address originally, so really this fix is from Az.
Exposes the directory for where your game files go in cmake without having to go to Advanced tab.
2021-01-10 21:48:46 +00:00
Joseph 4c781ce5c6 Enables support for having your project directory different to your Torque engine directory. 2021-01-08 20:59:35 +00:00
Brian Roberts a0ba345095
Merge pull request #432 from Azaezel/alpha40/sdlwebGeneralization
sdl usage standards proposal 3
2021-01-02 11:09:52 -06:00
AzaezelX 254ac462b5 sdl usage standards proposal 3:
again maintains fallbacks for folks that just don't want to use the lib (though if we do want to go that route, we'll likely want to re-review a few commits and put fallbacks, well, *back* at some point)
includes sdl in torqueconfig.h if in use to kill duplication.
adds a generic sdlPlatform.cpp for general methods, oneliners, and the like
2020-12-31 14:44:39 -06:00
AzaezelX 6b53b6581a mac fixes
1) add sdl token for referencing the parent directory of the aplication bundle when determining the root dir
2) shape and mateiral asset macro corrections for a few stray ## redundencies (space, ->, . ect are all conidered token sperators in and of themselves)
2020-12-30 19:36:51 -06:00
AzaezelX a31c71b009 fix compilation with shipping flag 2020-08-17 00:12:21 -05:00
Areloch a1baf0e03c A correction to the cmake file so if OGL is disabled, it doesn't include the sdl platform GL file, allowing the project to compile. 2020-06-07 02:52:06 -05:00
Areloch 69089e1ee2 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0_MenuUIRework 2020-06-01 03:48:20 -05:00
Areloch bc27125e90 Initial pass to rework and cleanup the main UI interface
Implements interface buttons that react to input type and visually display keybinds
Updates the T3D icon and splash screen
2020-05-20 17:19:52 -05:00
Areloch 9b907e77ee Swaps some references from the windows SDK-specific FLT_MAX to T3D's F32_MAX
Takes the makeFullPath in findTSShapeConstructor and turn it into a string before passing it along to the Filename to make stricter compilers happy
Removed some referenced to fields that don't exist in the current build
Removed unneeded ASM language activation for the cmake files
Adjustments to material map assembling macros to better comply to stricter compilers
2020-05-13 02:10:11 -05:00
Areloch 6ade6f08ce Updated Assimp
Added initial behavior for ImageAssets to hold a list of GFX resources of different texture profiles to avoid mem leaks with incorrect-typed usages
Added function to ImageAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found
Added function to ShapeAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found
Disabled fields for dynamic and static shadowmap refresh rates
Moved noShape model to core/rendering/shapes to place it in a more logical module position
Added an include to avoid undefined type compile error and removed unneeded semicolon from zone code
Added call to reload probe textures when a reloadTextures call is made
Adjusted default directional light shadowmap settings to not be as extreme
Added utility function to probe manager to allow any class to request a 'best fit' list of probes that would affect a given location, allowing other classes such as fog or particles to utilize IBL. Also updated probeManager's forward rendering to utilize same function to reduce code duplication.
Shifted shape loader code to utilize assimp for loader consistency and testing
Changed render bin used for SSAO postfx so it runs at the right time
Made Core_Rendering module scan for assets
Updated loose file references to a number of assets to follow proper formatting
Refactored asset import code to follow a more consistent object heirarchy structure on importing assets, allowing more reliable cross-referencing between inbound items
Updated asset import logic for materials/images so that they properly utilize ImageType. Images correctly save out the assigned image type, materials reference the images' type to know what map slot they should be used in. Importer logic also updated to better find-and-add associated images based on type.
Cleaned up a bunch of old, outdated code in the asset importer
Added initial handling for in-place importing of files without needing to process them through the UI.
Added ability to edit module script from RMB context menu if torsion path is set
Updated list field code for variable inspector to utilize correct ownerObject field
2020-03-19 09:47:38 -05:00
Areloch e885722093 Removed erroneous lib reference 2020-02-04 02:10:39 -06:00
Areloch f7b891442a Updated path handling for loose asset files for CPP, Image, Level, Material, PostFX, Shape, Terrain, TerrainMat and StateMachine assets to be more predictable in when and how they expando the loose file path into a full, useable path
Fixed loose file bindings for all associated slots in level asset, such as postFX file, decals, etc
Expanded TSStatic onInspect testcase to parse materialSlots and hook-in a specialized material field for editing/quick reference from the inspector
Adjusted expand behavior of guiTree to be more reliable
Added internal name 'stack' to inspectorGroup's stack child objects for easier access to add programatic fields
Removed redundant PreMult translucency type code
Added setting of feature so probes work when in forward/basic lit mode
Corrected indexing error in SQLiteObject class so it properly parses with the updated console API
Tweaked the FOV setting logic in GameConnection::onControlObjectChange to not be spammy
Fixed var when trying to bind the camera to the client
Added project setting field to dictate the default render mode between Forward or Deferred
Integrated MotionBlur PostFX into updated PostFX Editor paradigm and exposed the samples uniform as an editable field
Integrated DOF PostFX into updated PostFX Editor paradigm
Updated setting group name for vignette postFX
Shifted shaderCache to be in data/cache along with other cached files
Added helper function to replace strings in a file
Fixed ExampleCppObject asset to have correct loose file references
Adjusted editor default level logic so it can be modifed and then stored, as well as reset back to the original default
Fixed verve reference to root scene group
Adjusted location of a nonmodal gui profile so it loads at the correct time
Reorganized AssetBrowser loading and refresh logic so it doesn't stack multiple refresh requests back-to-back causing lag
Updated the search behavior to search not just the current address, but all child folders as well, making it far more useful
Initial work into zip and folder drag-and-drop asset importing support
Removed the import config setting for 'always display material maps' as it is redundant with the new importer context menu actions
Updated example asset type file
Ensured all asset types have proper handling for move, rename and delete actions
Fixed double-click behavior on folders in the AB
Fixed CPP asset preview
Added better logic to discern if a top-level folder belongs to a module or not in the AB directory browser
Added ability to convert a non-module top-level folder in the AB into a module
Added initial hooks for being able to generate a new Editor Tool, similar to how the AB can generate modules
Renamed CPP asset template files to have the .template so they aren't accidentally picked up by cmake
Fixed convex editor's material handling to work with AB and reference back properly
Updated AB images for folder up/down navigation buttons, and the breadcrumb divider arrow
Made PostFX Editor properly allow for input pass-through so you can still edit the level with it open
Added some additional common text gui profiles
Disabled calls to old editor settings logic in various editors to remove spam
Added callOnModules call so tools can initialize properly when the world editor is opened
Fixed logic test for visualizers
Added ability for cmake to scan tools directory for any tools that add source files
2020-02-04 01:47:28 -06:00
Areloch a43233d9c9 Updated move folder behavior to better update the module and asset databases of changes
added dynamic reload on editor profiles when the theme is changed via editor
Adjusted direct filename fields to just be hidden, not disabled(avoids breaking legacy content)
Added ability to update asset references in a given folder path
Added WIP ability to scan for and update module dependencies
2019-12-08 15:54:37 -06:00
Areloch 09c651c26d Corrected profile for GameObjectAsset type field button
Initial implementation of changeable TSStatic materials via material slots and drag and drop of material assets onto world editor from AB
Updated Volumetric Fog to support ShapeAsset for it's model data
Added cmake option to hide literal filename fields if the class supports asset fields for the same input
Added light viz modes to see diffuse, specular and detail lighting modes(currently just sun)
New raycast console function to return back material of hit object
Moved GameObject logic to SceneObject and started fixing up of editor behavior to allow any SceneObject to be converted into a GO, along with all supported behavior such as instance-template management and spawning GO via drag-and-drop from AB
Fixed inspector field tooltip text to be positioned in inspector footer properly again
Drag and drop of shape asset attempts to drop at raycast position now, instead of just at the camera ray position
2019-12-05 20:42:47 -06:00
rextimmy 240113f098 Old project generator is dead 2019-11-26 22:02:12 +10:00
Areloch c1e99364b7 Adds in missing assimp OBJ importer/exporter folder
Corrects highlighting behavior on ToolsGuiTextEditProfile
2019-11-18 21:42:55 -06:00
Areloch 7b5e1c3c58 @rextimmy fix for GuiWindowCtrl so they snap correctly again
Added asset loose files for editor and bake level files on level asset
Correct return of ConsoleGetType on TypeShapeAssetPtr
Adds shape asset support to TSStatic, now will support either raw shape file or ShapeAsset
Adds onInspect function behavior, so when object is inspected, it can do special editor behavior
Adds callback for when editTSCtrl is resized
Added editor setting to force the world editor sidebar(scene tree and inspector windows) to resize to fit to the right side of the screen automatically instead of float
If assimp loader encounters error, it's output into the console log
Makes root Data item in folder hierarchy tree in Asset Browser able to support right mouse popup menu action
Material and Shape assets now correctly base on current browsed folder
Material asset generation now more properly fills out common maps, as well as handles skipped dependencies better
More theme corrections
Updated TestGrid images asset defs to have proper loose file handling
2019-11-18 03:30:04 -06:00
Marc Chapman 413cb8ecfd Updated cmake file to list all import/export options 2019-11-10 14:45:13 +00:00
Marc Chapman 7ddf6cd4f2 Fix shader path and added console.log in cleanup.bat 2019-10-16 19:22:34 +01:00
Areloch e7bf49e801 Moved unneeded modules to Templates/Modules
Added templated getObjectsByClass to Scene for easier engine-side polling of objects, including nested checks for subscenes
Proper init'ing of mGamemodeName in LevelAsset, as well as proper fieldType for mIsSubLevel
D3D11 added logic to handle scaling down of textures in cubemap arrays for lower texture resolution preferences
Added ability to collapse groups programmatically to GuiVariableInspector
Upped PSSM shadowmap max size to 4096
Caught GL deferred lighting/probes up to D3D11
Temporarily disabled forward lighting/probes on GL materials until conversion finished
Upped smMaxInstancingVerts to 2000 from 200 to support slightly more detailed meshes being instanced
Reordered project settings so they load ahead of core modules, so that core modules can actually use project settings
Established current preset file for PostFXManager to use for reverting
WIP logic for forcing probes to update as part of level lighting load step in loading process
Streamlined PostFXManager code, removing unnecessary/redundant files
Coverted HDR, Lightrays and SSAO and ExamplePostEffect to use new PostFX Manager/Editor paradigm
PostFX manager now enacts callbacks so that postFXs' can process their own settings as well as provide editor fields
Changed PostFX editor to work with new callbacks via using VariableInspector
Updated PostEffectAsset's template file so new PostFX's will now automatically register with the PostFXManager and have the needed new callbacks for integration
Made HDR on by default, removed enable field from editing
Made probe bake resolution a project setting
Updated many GL postFX shaders to have proper case for PostFx.glsl
Example module now loads ExampleGUI and ExamplePostEffect during init'ing
Removed unneeded autoload definitions from ExampleModule's module file
Fixed Graphics Adapter settings field to properly display as well as apply setting
Updated many referenced profiles in tools folder to use the Tools specific gui profiles to make theming more consistent
Fixed coloration of tools button bitmap to make theming more consistent
Updated a few theme settings for improved visibility with theme, particularly selected/highlighted text
Moved AssetBrowser field types to separated folder/files
Updated new module creation to properly utilize template file instead of overriding it with a programmatic script generation.
Removed unneded default autoload definitions from new modules
Added WIP for editing Module/Asset dependencies
Updated the PostEffectAsset to properly generate glsl and hlsl files from templates
Updated module editor window to display only necessary fields
Added WIP of TerrainAsset
Added shaderCache gitignore file so folder isn't lost
2019-09-29 06:44:43 -05:00
Areloch 7c3bd49615 Adds ability to adjust padding to guiTextListCtrl's rows
ForcedMaterialMeshMgr tweaked to allow proper setting of override material
Ongoing WIP of update/fixing of options menus
WIP of expanded visualizers, including material complexity viz
Adds no-pie flag when compiling on linux with non-clang compilers
2019-09-06 00:00:17 -05:00
Jeff Raab 38b0d0f1fe Updates names of probe forward shader consts to be consistent with shadergen, allowing proper data throughput 2019-07-16 09:34:31 -05:00
AzaezelX bc77ff0833 Revert "Updated SDL, Bullet and OpenAL soft libs"
This reverts commit 370161cfb1.
2019-07-08 09:49:44 -05:00
Areloch f8750dd8ed Updated SDL, Bullet and OpenAL soft libs
Fixed case sensitivity problem
Fixed clang compiler problem with having the class namespace used in an inline for the == operator
Tweaked some theme stuff to be more consistent.
Added initial test of no-pie for linux
test sidestep of getTexCoord in shadergen hlsl feature so we don't assert when getting the terrain's shaderstuffs(which uses float3 instead of normal float2)
2019-07-07 02:43:49 -05:00
Areloch d9f80140f1 Include materialball shape asset info
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
2019-05-25 03:37:18 -05:00
AzaezelX 4ee8df8863 windows and linux AL_ALEXT_PROTOTYPES blocks, as well as exposed the defining of it cmake side for the adventurous (windows and linux on by default, mac off till we sort why dylibs are freaking out) 2019-05-24 14:12:04 -05:00
Brian Roberts 518cd593b2 revert to using the stock mac framework, and encapsulate nonstandard openal extensions usage under a set of #if defined(AL_ALEXT_PROTOTYPES) blocks 2019-05-24 11:11:09 -05:00
Brian Roberts c0c8ecf521 Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into alpha40Macwork 2019-05-23 02:27:22 -05:00
Brian Roberts 5ca2a5eb51 shift openal-soft directory add plus various cmake set(values) on over to an o/s agnostic block, rather than only including that if used on windows 2019-05-23 02:27:02 -05:00
AzaezelX afa52850c3 Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork
# Conflicts:
#	Engine/source/materials/materialDefinition.cpp
#	Engine/source/materials/processedFFMaterial.h
#	Engine/source/materials/processedShaderMaterial.cpp
#	Engine/source/renderInstance/renderBinManager.cpp
#	Engine/source/renderInstance/renderGlowMgr.cpp
#	Engine/source/renderInstance/renderMeshMgr.cpp
#	Engine/source/renderInstance/renderPassManager.h
#	Engine/source/renderInstance/renderTranslucentMgr.cpp
#	Engine/source/shaderGen/customShaderFeature.cpp
#	Engine/source/shaderGen/customShaderFeature.h
2019-05-22 23:36:15 -05:00
Areloch f9371bfc2e Proper splitting of D3D and OpenGL sides of the CSF. 2019-05-22 21:44:07 -05:00
Brian Roberts a5f2848b0d (partial) mac compilation correction -
1) correct cmake to look to the included openal-soft, not the system framework.
2) (incorrect) stubb-ins for library to function table binds
2019-05-21 21:31:30 -05:00
Areloch 3fa7a0d4fa Various fixes 2019-05-11 21:42:27 -05:00
Areloch e83ec69292 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch 82c74b4511 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -05:00
AzaezelX dd1470202d Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
Areloch 87ee749801 (Mostly) updated verve implementation. 2019-03-07 16:23:41 -06:00
Areloch 161bf7f83b Updated assimp to latest 2019-03-05 14:39:38 -06:00
Areloch 25ce4477ce Just the functional assimp lib rather than the entire assimp repository unnecessarily. 2019-02-28 16:37:15 -06:00
Areloch bf170ffbca WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Azaezel 9a7ae06721 tabspace 2019-01-06 15:50:19 -06:00
Azaezel 7900783163 constant consistency creates continuums 2019-01-06 15:42:18 -06:00
Azaezel 6ee436382f zenity backend file filter fix 2019-01-06 14:24:33 -06:00
Azaezel 14836daa89 linux compilation, defaults to using the older gtk solution till more folks have a chance to beat up the zenity one. 2019-01-01 15:40:44 -06:00
Azaezel 300abf0ecd blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux 2019-01-01 11:00:05 -06:00
Azaezel 1eed979a9c Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Areloch 900816fcd0 Merge pull request #2186 from rextimmy/physx_3_4
Physx 3.4
2018-12-09 15:28:43 -06:00
Azaezel 96101a0e56 correction for folks supporting older codebases outside of this engine: don't try and include the older directx library unless youre also deliberately using the older directsound end of things, and for dx11, reference the #include <d3d11_1.h> lib instead of the <d3d11.h> one to pair with the reference used by SDL2 2018-11-23 00:30:23 -06:00
Areloch b19a4b22c8 Implementation of reflection and skylight probes.
Moves lighting math to the diffuse/specular two-channel logic.
2018-09-16 22:15:07 -05:00
rextimmy a95f678602 physx support for vs 2017 round 2 2018-06-23 12:20:07 +10:00
Areloch ee9f3b74ec Merge pull request #2254 from rextimmy/sdl_2_0_8
SDL 2.0.8
2018-05-30 20:37:00 -05:00
Tim ad5d781cef cmake fix for apple sdl 2018-05-09 23:09:32 +10:00
rextimmy 925d8b27cf openal-soft updates 2018-05-09 20:48:18 +10:00
Glenn Smith cecf109f93 Higher resolution torque icon, 1024x1024 for macOS, 256x256 for Windows. 2018-04-14 17:51:29 -04:00
Areloch 570c6844f9 Makes it so the SDL directory files aren't copied during a template file install. 2018-04-03 23:58:03 -05:00
Tim c0b50792f7 physx support for vs 2017 2018-03-18 16:11:07 +10:00
Bloodknight 20eefee3cd Merge branch 'development' into issue_2115 2018-02-05 15:59:33 +00:00
Tim c0f298e37d Fixed physx3 linux cmake build 2018-02-03 13:40:33 +10:00
Areloch 963739102c Merge pull request #2182 from Areloch/AssetBrowser_Initial
Asset browser initial
2018-02-01 21:14:50 -06:00
Areloch 57284507f2 Adds the Systems for the Entity-Component-Systems setup. 2018-01-28 16:58:00 -06:00
chaigler b52cda0c66 Remove legacy_stdio_definitions.lib
Dependency was added by PR #1566. No longer needed now that DX SDK has
been replaced.
2018-01-24 08:17:40 -05:00
Marc Chapman cd6947c7e0 Phase 3: Adjust cmake files to add #define to torque config 2018-01-23 22:48:20 +00:00
rextimmy f2dc291cf5 PhysX 3.4 implementation 2018-01-19 22:34:26 +10:00
Areloch 601d232223 Removes the LibMNG and LunGIF libraries, as they aren't actually utilized and just extend the build times. 2018-01-02 15:48:44 -06:00
Areloch 0c21ef1b45 Removes Entity/Component stuff from being behind an experimental flag. 2017-10-15 06:03:59 -05:00
Areloch 6479c7592a Merge pull request #2088 from Areloch/EditorTool
Initial implementation of the EditorTool class and world editor hook-in.
2017-10-11 12:00:21 -05:00
Areloch e023cf3a60 Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -05:00
Areloch bc898e1150 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
rextimmy bdfe44cc93 Disable sqlite support by default 2017-09-10 09:56:09 +10:00
rextimmy 79118ee00f sqlite fixes 2017-08-31 21:07:23 +10:00
Areloch ad612e218b Merge pull request #2060 from Bloodknight/add_sqlite
SQLite Integration
2017-08-24 21:58:54 -05:00
Azaezel 5b7e973ad5 adress #1329 -flips off direc6tx sound by default 2017-08-09 02:53:27 -05:00
Marc Chapman b35aa017cc Add SQLite files + cmake file 2017-07-30 16:26:46 +01:00
Marc Chapman 1a17496c28 Cmake file to build AFX 2017-07-27 01:51:54 +01:00
Areloch adb875cb54 Conflict resolution with devhead.
Cleaned up a few remaining d3d9 references in the cmake file.
2017-06-01 23:54:44 -05:00
Areloch 1788bee4f6 Corrects an issue where a change to the target template may not generate the appropriate main.cs for that template after the initial build configure. 2017-02-27 17:10:08 -06:00
Areloch 1ed8b05169 Initial implementation of the new Base Game Template and some starting modules.
This makes some tweaks to the engine to support this, specifically, it tweaks the hardcoded shaderpaths to defer to a pref variable, so none of the shader paths are hardcoded.

Also tweaks how post effects read in texture files, removing a bizzare filepath interpretation choice, where if the file path didn't start with "/" it forcefully appended the script's file path. This made it impossible to have images not in the same dir as the script file defining the post effect.

This was changed and the existing template's post effects tweaked for now to just add "./" to those few paths impacted, as well as the perf vars to support the non-hardcoded shader paths in the engine.
2017-02-24 02:40:56 -06:00
Areloch 8b4b467bff Merge pull request #1932 from Areloch/cmake_cleanse
Cleans up a few cmake options and flags
2017-01-31 09:47:08 -06:00
Areloch 08432978bf Merge pull request #1922 from elfprince13/perProjectCmakes
Optionally include a CMake configurations file from the project directory
2017-01-25 21:06:05 -06:00
Areloch f43bfd6ca2 Cleans up a few cmake options and flags a most of the alsoft and sdl options as advanced so they're not cluttering up the regular view for no reason 2017-01-17 01:10:24 -06:00
Thomas "elfprince13" Dickerson de53ac86c7 Somebody broke SDL when they updated it. The new version depends on AudioToolbox, so added that as dependency in torque3d.cmake 2017-01-13 10:44:05 -05:00
Thomas "elfprince13" Dickerson f05a552c61 Optionally include a CMake configurations file from the project directory to support configuration changes that don't have to alter the whole engine repo 2017-01-11 18:03:21 -05:00
rextimmy 18c906ca09 Physx cmake module correction 2017-01-04 17:20:43 +10:00
rextimmy b23b8d118e Physx 3.3 cmake support 2017-01-04 01:47:01 +10:00
rextimmy 540c9b72c0 Bullet 2.85 update 2016-12-28 18:32:21 +10:00
Areloch d3dd5ce235 Merge pull request #1858 from Azaezel/options_ON
flips dx11, opengl, and sdl2 on by default now that those are no long…
2016-12-20 23:36:29 -06:00
RexTimmy 79dca17d5e Change VS to use the default fp:precise 2016-12-08 09:14:20 +10:00
Areloch a3740719b1 Merge pull request #1817 from jamesu/ipv6_pr
Preliminary IPV6 Support
2016-12-04 16:22:42 -06:00
Areloch e759ab8612 Merge pull request #1812 from Azaezel/testTrouble
clang: The unit test suite doesn't play nice with -wundef
2016-11-26 02:01:47 -06:00
Jeff Hutchinson 0296e6d3fd Fix merge conflict and add check for unix and not apple for glx
Merge branch 'development-gg' into gladdev

# Conflicts:
#	Tools/CMake/libraries/glad.cmake
2016-11-02 21:55:24 -04:00
James Urquhart 704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
RexTimmy 3a0a720115 OpenAL-soft for windows 2016-10-22 09:22:33 +10:00
Azaezel 09cbb0df1a -Wno-unused-local-typedef surpresses unused typedef spam (in fastDelegate in particular) 2016-10-19 18:50:13 -05:00
Azaezel 132aed4c71 -Wno-return-type-c-linkage surpreses "extern C warning" spam reguarding nonstandard classes used in conjunction with the script trampoline macros. 2016-10-19 08:01:48 -05:00
Azaezel a46b4fb5e8 clang: The unit test suite doesn't play nice with -wundef
(test for #if +uninitialized #defines)
leaving that as an option, but off by default to allow filtering through engine specific #defines for issues, rather than wading through the spam kicked up by the plugin.
2016-10-18 11:20:28 -05:00
Azaezel 16167b3250 filters false flags from clang compilation 2016-10-18 08:39:39 -05:00
RexTimmy dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
rextimmy 2ec38f98cc Update libogg to 1.3.2 2016-09-16 11:42:00 +10:00
Jeff Hutchinson 8fc96e8744 add glad license and remove epoxy cmake 2016-09-11 21:48:55 -04:00
Jeff Hutchinson fd4628a08a glad cmake 2016-09-11 21:48:36 -04:00
James Urquhart e6159a590a Add basic support for showing openvr controllers and tracked objects 2016-09-11 22:42:42 +01:00
James Urquhart e7bafe3c7b Fix cmake file for openvr 2016-09-11 22:42:42 +01:00
James Urquhart 126828131d Improve openvr, also add a module for it. 2016-09-11 22:42:42 +01:00
Azaezel 714bf1afba flips dx11, opengl, and sdl2 on by default now that those are no longer experimental. also seperates out the dedicated flag for compilation on windows 2016-08-25 16:53:09 -05:00
Anis 61418b1772 Merge pull request #1683 from John3/wrongPathMiniCLTask
Fix wrong folder path for cmake libbullet. Folder MiniCLTask and scalar
2016-08-07 02:29:41 +02:00
rextimmy 7c011cdd27 CMake support for VS_STARTUP_PROJECT 2016-07-16 12:14:31 +10:00
John3 4c7e8aac82 Fix wrong folder path for cmake libbullet. Folder MiniCLTask and scalar 2016-07-10 21:15:35 -05:00
Areloch 3a73344abb Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off. 2016-06-05 19:17:34 -05:00
Areloch 510b726f6f Final Linux compliance changes(renames, tweaks for gcc compliance, etc) 2016-05-29 00:58:02 -05:00
Areloch ec8882c3c8 Ensuring all names are the correct casing for Linux 2016-05-26 01:37:14 -05:00
Areloch f54fde9c6b Missing the preprocessor define in the project generation. 2016-05-19 23:42:38 -05:00
Areloch 03e6228e56 Adjusts the CMAKE install script to not install the E/C-related template files if that's not set as a flag. 2016-05-17 23:58:34 -05:00
Areloch b04ad52b5d Ensure that inclusion of any entity/component stuff is properly bracketed with the preprocessor check. 2016-05-15 10:11:46 -05:00
Areloch a63a636d03 Fixes the blacklist filter in the event we aren't using SDL to avoid including an unwanted file dialog codefile. 2016-05-05 22:59:17 -05:00
Areloch e8bc70e514 Merge pull request #1567 from JeffProgrammer/epoxy
Added Epoxy in favor of GLEW
2016-05-05 19:40:59 -05:00
rextimmy f1c8286c2f Fix for Epoxy to work with SDL and VS 2015 2016-05-04 10:05:34 +10:00
Areloch ec6f9c05a6 Integrates the nativeFileDialog library to enable native file dialogs on the major platforms. It is activated with SDL. 2016-04-30 15:48:33 -05:00
Jeff Hutchinson fddc00b39b Merge branch 'development-gg' into epoxy 2016-04-17 23:59:42 -04:00
Areloch 131090f1b7 Made the cmake SDL flag a regular, non-advanced option so that it's not hidden from the base setup on Windows. 2016-04-06 21:21:55 -05:00
Areloch 6a40b8bb84 Merge pull request #1559 from rextimmy/dx11_clean
Direct3D11 Support
2016-03-29 00:51:23 -05:00
Jeff Hutchinson b89d2a116e cmake for epoxy and rip glew 2016-03-25 13:38:40 -04:00
Jeff Hutchinson e9efc05ebb fix release build compile with MSVC 2015 (finally) 2016-03-24 14:22:45 -04:00
rextimmy bd60f3be1a Direct3D11 CMake and Project Generator files. 2016-03-20 21:55:40 +10:00
Areloch 00ca1e8692 Merge pull request #1464 from Azaezel/bulletModule
bullet module
2015-11-14 15:40:59 -06:00
Azaezel b48802c6c4 bullet module
verified extract from https://github.com/GarageGames/Torque3D/pull/1146
2015-11-14 11:28:21 -06:00
Areloch 1f72245772 Some cleanup and adding in the necessary changes to cmake. 2015-10-13 15:50:30 -05:00
Areloch 7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems.
Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
wcb 845ec9c452 CMake NMake fix to place exe in game directory 2015-09-23 19:46:36 -04:00
Areloch 31afbedfb6 Merge pull request #1346 from eightyeight/fix-threadpool-tests 2015-08-21 00:07:55 -05:00
Azaezel 6d121299ec -wall leads to incredibly long compile times (we're talking 5 minutes vs 80, here) 2015-08-03 17:09:53 -05:00
Daniel Buckmaster d68c9036bf Include thread tests in CMake. 2015-07-05 14:11:58 +10:00
Daniel Buckmaster 39f0e269d6 Merge pull request #1328 from GarageGames/release-3.7
Release 3.7
2015-06-24 19:00:57 +10:00
James Urquhart 3a457749ec Oculus VR DK2 Support
- Updated to work with 0.5.x SDK
- Uses Oculus Rendering rather than PostFX
- Stereo rendering refactored so more rendering info is grabbed from the DisplayDevice
- Implements an Offscreen Canvas for in-game gui with oculus
- Message dialogs and metrics display can now go to the OffScreen Canvas (if oculus demo is setup correctly)
2015-05-06 23:09:51 +01:00
Daniel Buckmaster 4a705c875c Move the Vagrant config into a distro-specific folder. 2015-04-19 16:18:03 +10:00
Luis Anton Rebollo 8f94614a6e Merge pull request #1169 from eightyeight/add-vagrant
Add Vagrant config
2015-03-15 01:26:18 +01:00
Luis Anton Rebollo c73355bcd6 Merge pull request #1049 from cornytrace/VS2012-Support
Add VS2012 support to projectgenerator
2015-03-14 22:43:37 +01:00
LuisAntonRebollo 30bf15f4ee Fix Linux rpath. Changed to use $ORIGIN. 2015-03-08 20:40:35 +01:00
LuisAntonRebollo 265d1a540a Fix Linux rpath. 2015-03-07 22:41:00 +01:00
Adam Beer 86b8b39978 Update vc2k8_lib_proj.tpl 2015-02-15 13:29:59 -05:00
Adam Beer 8d66817e36 Update vc2010_lib_proj.tpl 2015-02-15 13:28:12 -05:00
Daniel Buckmaster f821898857 Also turn unit tests on 2015-02-08 17:57:27 +11:00
Daniel Buckmaster 2416297b12 Separate GUI config. 2015-02-07 17:03:04 +11:00
Daniel Buckmaster 7252c69738 Readme will be replaced by wiki tutorial. 2015-02-07 14:27:10 +11:00
Daniel Buckmaster 4ea5ac8659 Default navigation module on in CMake 2015-02-07 14:07:30 +11:00
Daniel Buckmaster 7d3a76ab13 Start to work on Vagrant readme. 2015-02-07 13:20:45 +11:00
Daniel Buckmaster 2c0b941b31 Formatting. 2015-02-07 13:20:23 +11:00
Daniel Buckmaster 877aadd68e 64-bit is more common and works fine. 2015-02-07 13:20:10 +11:00
Daniel Buckmaster f01596554a Discovered a new dependency. 2015-02-02 17:07:12 +11:00
Daniel Buckmaster d6ce1c3601 Does not exist. 2015-02-02 17:07:06 +11:00
Daniel Buckmaster abea882862 No GUI mode for now. 2015-02-02 17:06:48 +11:00
Daniel Buckmaster 05fba1f110 Reorganised. 2015-02-01 22:01:12 +11:00
Daniel Buckmaster db06ffec7d Started to work on Vagrant configuration. 2015-02-01 21:22:05 +11:00
LuisAntonRebollo 1dacf7b04e Fix torqueConfig.h TORQUE_FRAME_SIZE. 2015-01-31 19:34:14 +01:00
LuisAntonRebollo 744e7d4745 Merge remote-tracking branch 'GG-Github/development' into dynamic-CMake-modules
Conflicts:
	Tools/CMake/torque3d.cmake
2015-01-30 18:24:38 +01:00
LuisAntonRebollo 5583e73ca5 Fix for CI server on gcc Linux. 2015-01-24 23:28:12 +01:00
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo aa35157eef PlatformSDL implementation. 2015-01-19 01:17:37 +01:00
Luis Anton Rebollo f4b3d1e4cb Merge pull request #1064 from bpay/cmake-fixes
CMake fixes
2014-12-27 03:18:26 +01:00
LuisAntonRebollo 29e610fbad OpenGL: Add project define for GLEW with php generator. 2014-12-27 00:39:47 +01:00
Ben Payne d1f450a001 Fix malformed flags 2014-12-18 18:29:03 -05:00
Ben Payne 09d1df4bed Fix executable naming for cmake builds 2014-12-17 15:27:02 -05:00
Ben Payne 4b57dde346 Fix broken cmake macro
Only the first config in the list was being seen
2014-12-17 14:03:51 -05:00
Ben Payne 58f07aecb4 Fix CMP0043 cmake warning when using cmake 3.0.2
COMPILE_DEFINITIONS_CONFIG has been deprecated, use generator expressions
with plain COMPILE_DEFINITIONS instead (available since 2.8.10)
2014-12-17 14:03:51 -05:00
Cornee Traas 6cb5496ae6 Add VS2012 support
Files are essentially just copied from the 2010 version with slight
tweaks, works without any warnings or errors.
2014-12-13 22:29:28 +01:00
LuisAntonRebollo a5d2455e2e Fix CI server. 2014-11-30 23:34:33 +01:00
LuisAntonRebollo 0a31af06f5 Fix PHP ProjectGenerator for OpenGL. 2014-11-30 04:37:10 +01:00
LuisAntonRebollo 98e3651db5 Merge pull request #940 from BeamNG/add_opengl_support
Add/Activate OpenGL render.
2014-11-30 02:48:13 +01:00
LuisAntonRebollo f1aff86510 Merge pull request #965 from eightyeight/opengl-project-manager
Added OpenGL module with some additions to the project generator
2014-11-30 02:24:04 +01:00
Daniel Buckmaster a0e1fca057 Merge pull request #685 from rextimmy/physx3_basic
Physx3 Physics Plugin
2014-11-29 20:05:08 +11:00
Daniel Buckmaster aa9ded00d6 Added OpenGL module with some additions to the project generator. 2014-11-28 19:09:02 +11:00
LuisAntonRebollo dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
Scott Przybylski f527b45ec2 Make torque3d.cmake load all .cmake files from the module folder.
Move option code to each individual module.
This makes it so you can add a new module without having to modify the torque3d.cmake
2014-10-10 23:50:05 -07:00
LuisAntonRebollo 535f56af6e Merge pull request #801 from eightyeight/gtest-tests
Googletest tests
2014-10-02 01:31:13 +02:00
LuisAntonRebollo 42386b3f6f Merge pull request #795 from BeamNG/T3D_x64
Support for Windows x64 builds
2014-10-02 01:31:07 +02:00
Daniel Buckmaster 6cc59a97cc Added CMake flag for unit tests. 2014-09-29 11:38:47 +10:00
Daniel Buckmaster b173e5571c Moved async packet queue test and commented it out. 2014-09-29 11:38:42 +10:00
Daniel Buckmaster 87c4c5c790 Removed old test framework from project generators. 2014-09-29 11:38:39 +10:00
Daniel Buckmaster 178484ca6a Moved zip tests and commented them out :(. 2014-09-29 11:38:37 +10:00
LuisAntonRebollo b18bcfb709 Fix compiler warnings with CMAKE and TORQUE_DISABLE_MEMORY_MANAGER. 2014-09-28 20:27:29 +02:00
Daniel Buckmaster 65f6a4fe0a Link against librt. 2014-09-22 22:11:03 +10:00
LuisAntonRebollo 6bfb7d8186 CMake changes for WIN64 2014-09-14 21:42:08 +02:00
Daniel Buckmaster 225ef8a9ff Removed unused GFX interactive tests. 2014-09-01 08:39:59 +10:00
Daniel Buckmaster 5a430af051 Merge remote-tracking branch 'gg/development' into gtest-tests 2014-08-30 17:51:41 +10:00
Daniel Buckmaster 2f95583df8 Ported thread tests without the stress tests. 2014-08-02 16:43:29 +10:00
Daniel Buckmaster 00ec14561b Add component test directory to project generator. 2014-08-01 15:02:24 +10:00
Anders Dahnielson 0ca4dc75a8 Improving CMake build system for power user
* Making it possible to override the project directory location
  by setting TORQUE_APP_DIR.

* Making it possible to skip template installation (copying) to
  project directory by setting TORQUE_TEMPLATE to OFF.
2014-07-28 13:06:33 +02:00
LuisAntonRebollo 57ac2f8546 Add GG(c) and MIT license to CMake files. 2014-07-18 22:07:38 +02:00
LuisAntonRebollo a030f47178 Fix CMake testing module. 2014-07-12 13:44:48 +02:00
LuisAntonRebollo e09a09005d Merge pull request #706 from eightyeight/add-gtest
Add Google test library
2014-07-12 12:53:57 +02:00
Daniel Buckmaster d1070210c2 Fixed tool support. 2014-07-12 00:00:46 +02:00
Daniel Buckmaster ec78e4d502 Append ' DLL' to DLL filename to improve VS link times. 2014-07-10 11:56:33 +02:00
Daniel Buckmaster 551a7b3820 Added Google test library. 2014-06-24 08:38:52 +10:00
rextimmy d58a69e76c Merge remote-tracking branch 'GarageGames/development' into physx3_basic 2014-06-06 22:40:14 +10:00
LuisAntonRebollo 17bd69e659 CMake changes for dedicated builds. 2014-06-02 02:15:55 +02:00
LuisAntonRebollo 8a50895062 Clean CMake files. 2014-06-02 01:35:06 +02:00
LuisAntonRebollo 492f217330 Move CMake library's files to libraries dir. 2014-06-02 01:26:39 +02:00
LuisAntonRebollo efa3c02291 CMake: Remove unsused variable, and revert a small change. 2014-05-28 19:21:12 +02:00
LuisAntonRebollo 808dcb653c Remove TABs on CMake files. 2014-05-28 17:55:05 +02:00
LuisAntonRebollo 1e06fd2e60 Improvements on CMake generator.
* Suppress selected warnings on VC.
* Configurable directories (for CI server).
2014-05-28 13:17:32 +02:00