Commit graph

119 commits

Author SHA1 Message Date
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 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 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
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 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 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
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
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
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
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 bc898e1150 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
Azaezel 5b7e973ad5 adress #1329 -flips off direc6tx sound by default 2017-08-09 02:53:27 -05: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 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