Commit graph

150 commits

Author SHA1 Message Date
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
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