Commit graph

225 commits

Author SHA1 Message Date
Bloodknight 6a4f399031 typofix 2023-10-16 17:27:01 +01:00
Bloodknight 618590e1d0 Add config to advanced 2023-10-16 17:23:29 +01:00
Bloodknight 402f7aff99 Update SDL to 2.28.4 2023-10-16 16:51:30 +01:00
AzaezelX b278802645 cmake cleanups
new global defines: TORQUE_LIB_ROOT_DIRECTORY and TORQUE_LIB_TARG_DIRECTORY for source location and target to build static libs, respectively
reassign location back to torqueConfig.h, torque.rc, and Info.plist to  "${TORQUE_APP_ROOT_DIRECTORY}/source/ aka \My Projects\<apname>\source by request
2023-10-14 23:02:55 -05:00
AzaezelX c67a8f0440 clean out bullet temp files 2023-08-02 11:03:34 -05:00
marauder2k7 c09f79d199 separate testing environment
-Separate main for running unit tests
-Move unit tests into testing folder
2023-07-24 12:38:36 +01:00
AzaezelX c70e436350 Merge branch 'SDLUpdate_2_28_1' of https://github.com/Areloch/Torque3D into alpha41/cmake_adjustments 2023-07-23 13:54:39 -05:00
AzaezelX 020754b7b2 Revert "update sdl to 2.26.5"
This reverts commit 0e44e165bd.
2023-07-13 16:01:25 -05:00
JeffR 083d2175ea Updates the SDL library to the latest standard bugfix release 2023-07-13 15:20:29 -05:00
AzaezelX 80437b3515 suggested sdl compile fix 2023-06-17 15:07:12 -05:00
AzaezelX 52093cbde5 Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/cmake_adjustments 2023-06-08 13:31:34 -05:00
AzaezelX 9f01515e78 library containment:
after execution of found cmakelists.txt files, searh the engine/lib and apname/data directories recursively for a *torque_postbuild.cmake file, including the contents, to ensure any values used, such as TORQUE_LINK_LIBRARIES remain in parent scope
2023-06-06 19:32:58 -05:00
AzaezelX 8284604315 hide extra mac-side compiler flags 2023-06-05 10:39:28 -05:00
AzaezelX 916e722922 correct overstep 2023-06-04 23:20:03 -05:00
AzaezelX 39bb7fb7b3 supercede ASSIMP_BUILD_NO_OWN_ZLIB config 2023-06-04 21:13:45 -05:00
AzaezelX f6bd20afe1 shift zlib to first compiled library, shift mark_as_ASSIMP_HUNTER_ENABLED to a (hidden) option to attempt match the assimp define 2023-06-04 18:49:24 -05:00
AzaezelX 1194f7f49d shift non-torque config flags over to lib/cmakelists.txt 2023-06-04 09:41:48 -05:00
AzaezelX 653580b469 get ogg working 2023-06-03 20:29:35 -05:00
AzaezelX c147cda110 additional library filters 2023-06-03 14:59:23 -05:00
AzaezelX 8906c12ddd kill dupe macro definitions, add macro(addFramework framework) for mac support to append frameworks, and further mark-as-advanced cleanups 2023-06-03 13:47:36 -05:00
AzaezelX df24913f79 flip off assimp warns as errors 2023-05-31 17:10:56 -05:00
AzaezelX af88962d04 gtk check 2023-05-31 17:07:05 -05:00
AzaezelX 06f20a0476 correct a few cmake flags and options 2023-05-31 16:43:51 -05:00
AzaezelX 0ab5860286 assimp compile fix mac side 2023-05-28 18:42:48 -05:00
AzaezelX 6e6f785bab Merge branch 'alpha41/sdl2_26_5' into alpha41/cmake_adjustments 2023-05-28 12:04:34 -05:00
AzaezelX c3f53b99ea update assimp to 5.2.5 Bugfix-Release 2023-05-28 11:19:45 -05:00
AzaezelX 360edf18a1 quick collada compile fix as a straight update would pull in the boost library as well for yet another dependency 2023-05-28 00:14:37 -05:00
AzaezelX 166128dd73 update NFD to 67345b80eb 2023-05-27 20:47:21 -05:00
AzaezelX c61439c2f9 Merge branch 'cmake_adjustments' of https://github.com/Ragora/Torque3D into alpha41/cmake_adjustments
# Conflicts:
#	Engine/lib/assimp/INSTALL
#	Engine/source/console/fileSystemFunctions.cpp
#	Tools/CMake/basics.cmake
#	Tools/CMake/modules/module_testing.cmake
2023-05-27 18:18:17 -05:00
AzaezelX 0e44e165bd update sdl to 2.26.5 2023-05-27 10:16:20 -05:00
XXTH a81c6ebd06 clean up 2023-05-12 11:42:06 +02:00
XXTH e0ab3830af bsd ready 2023-05-10 14:58:47 +02:00
AzaezelX 0ce2da3a23 clean up math varsize complaints 2023-04-27 16:10:04 -05:00
Lukas Aldershaab 1d28ddf734 Cleanup and improve 2023-04-06 15:28:09 +02:00
Robert MacGregor 2f1d21eea6 * Feature: Re-add NFD support. 2023-01-22 21:13:39 -05:00
Bloodknight 16f3710058 Update Assimp from 5.2.3 to 5.2.5 2022-10-02 19:21:41 +01:00
Glenn Smith 01a719ee58
Update libcurl 2022-09-03 01:31:41 -04:00
Glenn Smith 20eb0a911a
HTTPObject with CURL 2022-09-03 00:54:26 -04:00
Robert MacGregor 3d963d44e3 * BugFix: Allow header files to appear in the filters through use of a helper function torqueAddSourceDirectories. 2022-06-01 13:18:34 -04:00
Robert MacGregor 51bf96a290 * BugFix: Initial work on generating filters.
* BugFix: For now, comment out a line in libpng's CMake scripts causing issues on XCode.
2022-06-01 11:56:31 -04:00
Robert MacGregor 0b15bc25e0 * BugFix: Correct Assimp building its own copy of ZLib. 2022-05-31 20:42:49 -04:00
Robert MacGregor 4efd59ceb3 * BugFix: Add missing oggvorbis/theora support. 2022-05-31 09:05:02 -04:00
Robert MacGregor 7380161054 * BugFix: Correct convexDecomp compilation by setting the LINUX flag when necessary.
* BugFix: Update OpenAL to correct a compilation error on Linux.
2022-05-30 16:32:45 -04:00
Robert MacGregor eab544c8f3 * Adjustment: Update libsdl to address a bug in compilation on MacOS devices. 2022-05-21 20:25:30 -04:00
Robert MacGregor b23554295c * BugFix: Correct some errors in the module scripts.
* BugFix: Fixes for compiling on Windows.
2022-05-21 18:07:14 -04:00
Robert MacGregor dfc03da9d9 * Feature: Begin working the new engine module system. 2022-05-17 20:42:35 -04:00
Robert MacGregor 9901fa76b4 * Feature: Initial testing with module (file) searches. 2022-05-17 18:04:19 -04:00
Robert MacGregor 786dac7419 * Feature: Obtain a building executable on MacOS, but need to resolve the crashing issues and multi-configuration settings. 2022-05-17 13:14:00 -04:00
Robert MacGregor d7cdf54661 * Adjustment: Initial CMake reworking. 2022-05-13 23:42:41 -04:00
Brian Roberts fea5f325ea
Merge pull request #777 from Azaezel/alpha40/assimp523
update assimp to 5.2.3 Bugfix-Release
2022-05-06 17:10:51 -05:00
AzaezelX 7716663346 need to unhide OBJ for this one 2022-04-26 17:11:02 -05:00
AzaezelX 82e608f990 add workaround logic for configuration file generation 2022-04-26 16:03:00 -05:00
AzaezelX f297476092 update assimp to 5.2.3 Bugfix-Release 2022-04-26 11:56:24 -05:00
AzaezelX d4307ea413 update sdl to release 2.0.22 2022-04-26 09:17:21 -05:00
AzaezelX 2614274639 update sdl to https://github.com/libsdl-org/SDL 22March 2022 2022-03-23 01:43:08 -05:00
Robert MacGregor 4758f7bdaf * Adjustment: Update Assimp version to 5.0.1. 2021-10-21 21:14:55 -04:00
Robert MacGregor 2f3215c4fb * [lpng] Adjustment: Update libpng to version 1.6.37. 2021-10-12 22:04:36 -04:00
Robert MacGregor c965429cf6 * [lpng] BugFix: Corrections to allow the SSE intrinsics to build properly. 2021-10-12 17:38:27 -04:00
Robert MacGregor 1385b29f03 * Adjustment: Initial testing with extensions to load GPU VRAM. 2021-10-10 20:53:55 -04:00
Robert MacGregor 1b6b803a20 * BugFix: Clear a lot of warnings and correct a few actual programming errors along the way. 2021-10-04 20:04:21 -04:00
Lukas Aldershaab 9a795e89f3 Update usage of TinyXML to use TinyXML2 2021-07-31 21:54:19 +02:00
Lukas Aldershaab cd170910b2 Replace TinyXML library with version 9.0.0 of TinyXML2 2021-07-31 21:53:10 +02:00
AzaezelX 0c23599023 adress #501 - thread oversight.
as discussed in the followup conversation to #500, seems like there's been a bit of command-drift since the writeup we were referencing to attempt consistentcy, so back to treating mac and nix differently on this front, looks like
2021-07-19 09:58:14 -05:00
AzaezelX cddacf1c48 mac compilation and standarization fixes
compresses void tc_spinloop() for both unix derivatives and apples to utilize pthread_yield_np();
mac only tweaks to Platform::getUserHomeDirectory() to return the ~/documents directory for parity with windows results
2021-07-01 14:10:07 -05:00
Jeff Hutchinson 61fef8080b mend 2021-05-10 19:58:51 -04:00
Jeff Hutchinson e981fd2cc3 Add support for aarch64 / apple silicon 2021-05-10 15:55:56 -04:00
AzaezelX 3603188b7f update openal-soft
sync point: master-ac5d40e40a0155351fe1be4aab30017b6a13a859
2021-01-26 13:01:35 -06:00
AzaezelX 80f184e73d obsolete file removal 2020-12-22 17:44:24 -06:00
AzaezelX 77fc164e96 update sdl2 to release https://github.com/spurious/SDL-mirror/tree/release-2.0.14 2020-12-22 14:33:44 -06:00
AzaezelX c746871b0a zlib - remove modified mini variant from assimp. we're using the big one elsewhere 2020-11-07 22:03:04 -06:00
Areloch bf8455469f from @rextimmy: appends vcruntime as a release dependency when using visual studio versions exceeding mark 1920, as failure to do so was leading to Error LNK2019 unresolved external symbol memset referenced in function SDL_vsnprintf_REAL
Ported up for the 2.0.12 version
2020-08-12 13:28:31 -05:00
Areloch a526029f2f Updates SDL to 2.0.12 2020-08-12 11:56:18 -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
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
Marc Chapman c2018ad3de Upgrade to Assimp 5.0 2019-11-10 14:40:50 +00:00
AzaezelX 059d531b62 linux followup work by tim 2019-08-21 03:12:54 -05:00
AzaezelX 669e811cbb from @rextimmy: appends vcruntime as a release dependency when using visual studio versions exceeding mark 1920, as failure to do so was leading to Error LNK2019 unresolved external symbol memset referenced in function SDL_vsnprintf_REAL 2019-08-21 02:40:32 -05:00
Areloch c932bda8dd Update to SDL2.0.10 2019-08-19 23:30:35 -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
OTHGMars 2d1f78858f Fixed text formatting 2019-05-21 07:10:05 -04:00
OTHGMars 9a1766479d Import Options gui Update
Updated import options gui with tree view, additional shape statistics and settings load/save options. See /Engine/lib/assimp/t3d_usage.md for usage tips.
2019-05-21 01:19:35 -04:00
OTHGMars 45f631b5e5 Prevents engine crash when loading shapes using the KHR_draco_mesh_compression extension. 2019-05-21 01:06:01 -04:00
OTHGMars 6be2989bbc glTF2 Importer Update.
Vertex weights are now correctly assigned for skinned meshes. Portions of the vertex weight fix were taken from: https://github.com/ConfettiFX/The-Forge/blob/master/Common_3/ThirdParty/OpenSource/assimp/4.1.0/code/glTF2Importer.cpp#L823-L860.
Inverse bind matrices have been adjusted to be consistent with the other importers.
All nodes, joints and meshes are now named so T3D can cross reference when loading animations.
All T3D specific changes have been bracketed in //T3D_CHANGE_BEGIN and //T3D_CHANGE_END tags to make them easier to find when the assimp library is updated.
2019-04-25 15:41:01 -04:00
OTHGMars 698b7dddc2 Fix required for loading the binary gltf files included in the assimp unit test shapes. 2019-04-15 19:05:14 -04: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 b0aa733c4e NFD updated to 1.1.4 2019-01-01 10:58:53 -06:00
Azaezel ee64270a2d micro patch to the nativefiledialogues library to mirror file type name
folks with 'hide extensions for known file types' on windows weren't seeing any entries in thier drop-down lists for file types.
2018-08-07 13:14:25 -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 ec8f56b3b0 sdl 2.0.8 update 2018-05-09 23:09:05 +10:00
rextimmy 925d8b27cf openal-soft updates 2018-05-09 20:48:18 +10:00
Areloch cd0bc17bfe Merge pull request #2193 from John3/bullet_2_87
bullet 2.87 update
2018-04-30 23:35:50 -05:00
Areloch c894820eea Merge pull request #2194 from John3/libogg_133
update to libogg v133
2018-04-30 23:08:08 -05:00
Johxz cf4261db4a update readme version files 2018-02-28 22:42:42 -06:00
Johxz 594866f24c update recast 2018-02-28 22:15:31 -06:00
Johxz 5daa5ade2d delete old files 2018-02-28 13:01:06 -06:00
Johxz c7579f76fc update to libogg v133 2018-02-04 22:26:02 -06:00