TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-07 21:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4572 commits 5 branches 33 tags 958 MiB
Commit graph

221 commits

Author SHA1 Message Date
Areloch e023cf3a60 Merge pull request #2056 from Bloodknight/afx_merge_main 
Afx merge main
 2017-10-11 08:47:47 -05:00
Areloch 70c154c7d3 Implement of the shader consts binding. 2017-10-10 15:54:54 -05:00
Areloch 5019478aad begun adding uniform hooks 2017-10-07 14:36:58 -05:00
Azaezel debfd9b780 Sanity check to ensure detail levels shift in tandem for skinned meshes 2017-09-13 14:58:54 -05:00
Marc Chapman eeac02545a triggers -- exposes trigger states to other code. 2017-07-27 01:34:44 +01:00
Johxz 39e5fe689b corrected shape path 2017-07-10 20:02:06 -05:00
Areloch 25686ed4be Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Areloch 214aae7277 Removed the unneeded PPC And Altivec elements, and removed the LOCBUILD flag 2017-04-09 23:26:35 -05:00
Areloch ed14b6fced Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Thomas "elfprince13" Dickerson d64e2a7019 Removed constexpr use to support VS2013 2017-01-10 23:22:05 -05:00
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Thomas "elfprince13" Dickerson 39bea37fa0 minor fixes, and converted the type table 2017-01-06 17:19:36 -05:00
Thomas "elfprince13" Dickerson 500383591c TSShapeConstruct commands converted 2017-01-06 17:19:27 -05:00
Johxz f610c7ab24 fix atlas texture, extra info for opencollada 2016-12-09 16:29:23 -06:00
Johxz c43de8881f added materials, better compatibility with maya and 3ds max, better collada spec for compliance 2016-12-03 16:59:17 -06:00
Johxz 6cc1c27fd2 missing to load the texture 2016-11-29 19:49:41 -06:00
Johxz b2f615915e remove old colladamax format, fixed up bad coordinates, added new collada format, valid against the COLLADA 1.4.1 schema, added to load textures and UVs. 2016-11-26 14:13:54 -06:00
Anis bd4f2b002d Merge pull request #1801 from Azaezel/registerRemoval 
clang: register type modifier deprecated
 2016-10-21 20:04:42 +02:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight 
clang: constructor initialization order
 2016-10-19 08:39:12 -05:00
Azaezel fbfd3ed8ed clang: constructor initialization order 
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
 2016-10-14 18:16:55 -05:00
Azaezel cc9955e102 unused variable cleanup 2016-10-14 17:49:56 -05:00
Azaezel dd0b7914e6 clang: register type modifier deprecated 2016-10-14 17:37:00 -05:00
Areloch ab68a19a8b Merge pull request #1750 from Azaezel/LODloss 
short term LOD correction
 2016-09-14 01:47:23 -05:00
Areloch f88975121d Merge pull request #1761 from Bloodknight/intrinsicsfix 
Intrinsicsfix
 2016-09-13 21:43:18 -05:00
James Urquhart a46779fad6 Defer re-init'ing the shape when TSShapeConstructor is loading a shape 2016-09-03 10:41:25 +01:00
Marc Chapman 00cf5ab577 Added x64 check for SSE Intrinsic functions 2016-09-02 05:10:46 +01:00
James Urquhart 0e717ea707 Fix edge case where an editable shape without a vbo is saved 2016-09-01 00:36:17 +01:00
James Urquhart 18031f09b1 Fix edge-case with version 24 shapes 2016-09-01 00:30:29 +01:00
James Urquhart 12019173af Fix load with DTS shapes introduced with HW skinning changes 2016-08-30 19:07:02 +01:00
Azaezel a50ff1b054 short term LOD correction to preserve current widescreen vs 4:3 windows while closer matching prior release results 2016-08-25 19:17:37 -05:00
James Urquhart e7db0d7956 Fix mesh load issue & merge issue 2016-08-21 02:15:26 +01:00
Azaezel 41dfb64210 hardware skinning and instancing are mutually exclusive 2016-08-21 01:43:30 +01:00
James Urquhart 3496c549b5 Hardware Skinning Support 
- Supports GL, D3D9 & D3D11
- Extends vertex formats & shadergen to support blend indices and weights
- Adds basic support for using 4x3 matrices for shader constants
- Supports software fallback
 2016-08-21 01:43:30 +01:00
Azaezel 3553ed0bf1 accutex was left out of the copy constructor for TSRenderState. 
caused issues with https://github.com/GarageGames/Torque3D/pull/1711
 2016-08-08 09:03:16 -05:00
Azaezel c67ba876d0 raycast division safety - corrects issues with awesomium and the guionobject resources relating to WYSIWYG casts. 2016-06-27 13:48:11 -05:00
rextimmy 41e5caf22b Direct3D11 Engine/source changes 2016-03-20 21:52:11 +10:00
Alex Piola d2d5b8d834 Fix zipped dts loading 2016-03-04 10:45:55 +01:00
Azaezel 0f173df0d4 setDetailFromDistance aspect ratio friendly adjustment 2016-01-28 00:42:08 -06:00
Marc Chapman ac7d6e6691 Updated paths for collada tdictionary.h 2015-12-13 03:33:39 +00:00
Areloch 165cdb64e9 Merge pull request #1322 from Areloch/String_isEmpty_Convert 
Replace uses of dStrIsEmpty with new String::isEmpty
 2015-10-31 23:40:13 -05:00
Areloch b1d2ba8412 Merge pull request #1379 from Azaezel/C4189 
C4189 warning cleanups
 2015-09-02 19:46:28 -05:00
Azaezel 5bc926e97c warning C4005: 'WIN32' : macro redefinition 2015-08-06 21:01:20 -05:00
Azaezel 5615b642df suggested revision 2015-07-29 08:41:36 -05:00
Azaezel 555610f69f Addresses roughly half of the C4189 errors though the following methodologies: 
1) truly unused vars removed
2) vars leading to remmed out code for debugging remmed in turn.

left out:
vars in macros.
 2015-07-29 03:03:27 -05:00
Daniel Buckmaster e10b421641 C4458 declaration hides class member. 
There are plenty more of these, but they should be fixed by revising the
names of members to start with m, instead of fixing the local violations.
There was a previous PR for that but it went badly. Will retry again one
day.
 2015-07-23 20:13:04 +10:00
Areloch 2002d74b78 Issue found with PVS-Studio: 
Many instances of a function or expression being used repeatedly, which can lower performance.

Fixed it in these cases by creating on local var, reference or pointer that's used instead.
 2015-07-13 22:51:17 -05:00
Areloch 6e8fa7215a Moves from using dStrIsEmpty to the new String::isEmpty static function. Keeps things cleaner, consistent, and works with intellisense. 2015-06-06 17:40:49 -05:00
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Azaezel c84051fc60 typofix for void ColladaAppMesh::lockMesh(F32 t, const MatrixF& objOffset) which was preventing level load. 2015-03-02 00:25:40 -06:00
Daniel Buckmaster 33fcc59543 Merge remote-tracking branch 'origin/style-cleanup' into development 
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
 2015-03-01 22:30:22 +11:00
Luis Anton Rebollo 6492028bb2 Merge pull request #1035 from bpay/memfixes 
Memfixes
 2015-01-25 13:42:32 +01:00
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
Daniel Buckmaster ae284a89ec Merge branch 'development' into defineconsolemethod 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
 2014-12-26 13:22:16 +11:00
Daniel Buckmaster 7d376386d1 Merge pull request #1074 from Azaezel/AccuVolumes_2 
Accumulation volumes
 2014-12-26 13:18:00 +11:00
Daniel Buckmaster 3ab048c5b0 Fixes after feedback from Luis. 
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
 2014-12-23 18:48:02 +11:00
Azaezel c6cdfafe4e cleaned up variant of https://github.com/GarageGames/Torque3D/pull/768 alterations: opengl support, in-shader bug-reporting, direction vector fit to material slider-bar. 2014-12-21 14:07:42 -06:00
Daniel Buckmaster 9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod 
Conflicts:
	Engine/source/T3D/missionMarker.cpp
 2014-12-21 21:23:55 +11:00
Daniel Buckmaster 33ff180593 Merge branch 'development' into style-cleanup 
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
 2014-12-15 12:15:55 +11:00
Ben Payne c50c88d071 Fix use-after-delete errors 2014-12-11 19:09:01 -05:00
LuisAntonRebollo d97bccb798 Fix AMD render problem with missed meshes. 2014-12-09 17:34:16 -05:00
Daniel Buckmaster 3082bb3adc Merge pull request #884 from GarageGames/development-3.6 
Version 3.6.2
 2014-11-05 20:28:01 +11:00
Vincent Gee 9907c4592e Fixed bad string compares and simdictionary 2014-11-04 19:51:13 -05:00
Vincent Gee acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster d12310602d Increment vertex pointer by 3, not 1. 2014-11-02 07:35:39 +11:00
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
 2014-10-14 15:09:11 +11:00
LuisAntonRebollo 42386b3f6f Merge pull request #795 from BeamNG/T3D_x64 
Support for Windows x64 builds
 2014-10-02 01:31:07 +02:00
LuisAntonRebollo fcf7bee64a Fix x64 problems for WIN64. 2014-09-14 21:42:51 +02:00
rextimmy 1829deb432 - Added check in tsMesh::createTangents to check size of incoming normals 2014-08-27 11:55:59 +10:00
Daniel Buckmaster cf5d48e6ef Merge pull request #665 from andr3wmac/multiformat 
Support for large lists of shape formats.
 2014-07-08 14:14:54 +02:00
bank f3fc84738b Use fixed buffer size var when allocating return buffer from console. 
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
 2014-06-11 13:09:55 +04:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes 
Various engine fixes
 2014-05-23 14:09:00 +02:00
Andrew Mac eb74525a38 Added support for large lists of shape formats. Needed for assimp. 2014-05-21 14:50:44 -03:00
bank bcb0b8e088 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSThread 2014-05-13 16:44:16 +04:00
bank a310983e49 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSSortedMesh 2014-05-13 16:33:37 +04:00
bank 75755e42c0 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSStaticPolysoupConvex 2014-05-13 16:15:36 +04:00
bank 69dbaf5b85 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShape 2014-05-13 14:08:42 +04:00
bank 2112c81446 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSSkinMesh 2014-05-13 12:45:42 +04:00
bank e2545c359c Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSMesh 2014-05-13 12:43:01 +04:00
bank 1778a8d7f2 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShapeLoader 2014-05-13 12:15:47 +04:00
bank 9aeb4389f3 Rename all member variables to follow the style guidelines (prefixed with the 'm') - ColladaExtensions 2014-05-13 11:40:56 +04:00
bank 733347fd61 Rename all member variables to follow the style guidelines (prefixed with the 'm') - struct ImportOptions (ColladaUtils) 2014-05-12 19:23:25 +04:00
bank 40037b8b51 Rename all member variables to follow the style guidelines (prefixed with the 'm') - ColladaUtils (struct AnimChannels, struct AnimData, struct AnimatedElement) 2014-05-12 19:11:45 +04:00
bank 9ccf5baf94 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class ColladaPrimitive 2014-05-12 19:03:16 +04:00
bank 1619e194e1 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class _SourceReader (ColladaUtils) 2014-05-12 18:58:38 +04:00
bank a53580ca60 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class MeshStreams 2014-05-12 18:41:30 +04:00
bank 7c1544317b Rename all member variables to follow the style guidelines (prefixed with the 'm') - class ColladaAppMesh 2014-05-12 18:37:22 +04:00
bank 9e3eab7551 Rename all member variables to follow the style guidelines (prefixed with the 'm') - struct VertTuple (used in class ColladaAppMesh) 2014-05-12 18:32:39 +04:00
bank aefa796056 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class AppMesh 2014-05-12 18:20:59 +04:00
bank 6d176cf8db Rename local variable to prevent confusion with member variable. 2014-05-06 15:39:21 +04:00
bank b0fcc91058 Fix: removed 'virtual' for classes which doesn't have child. 2014-05-06 12:40:47 +04:00
bank e7fb6a54de Fix: Added missing virtual destructors for classes with virtual functions. 2014-05-06 12:40:46 +04:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
 2014-04-04 13:43:25 +11:00
Thomas Fischer 7239c791f2 Merge pull request #581 from tdev/vs2012_fixes 
Visual Studio 2012 32Bit Level 4 Warning fixes
 2014-03-17 10:02:19 +01:00
Thomas Fischer fec4cc8acd Merge pull request #538 from Azaezel/Tangent_Basis_Floor 
Tangent Basis Cleanup
 2014-03-17 00:12:03 +01:00
Thomas Fischer 489106ae5e replaced UNUSED and assert combination by a fixed up assert macro - thanks luis! :) 2014-03-15 12:50:38 +01:00
Thomas Fischer 2844ab6912 more VS2012 L4 warning fixes 2014-03-15 11:51:36 +01:00
Andrey Syrokomsky 939061ef59 Fixed issue #256: "$pref::TS::smallestVisiblePixelSize doesn't work". 2014-01-21 18:45:02 +02:00
Azaezel ecbcf5eb3a Simply early-outing from denominators near zero was causing tangeants to be filled with garbage data. This alters the functionality to set a floor distance so the rest get's filled out properly. 2013-11-13 20:40:20 -06:00
DavidWyand-GG 7e4cbc56f5 Fix for DTS Vertex Paint and 2nd UV with LODs 
Fix game from https://github.com/GarageGames/Torque3D/issues/230
 2013-11-05 16:50:25 -05:00
DavidWyand-GG 1923838f63 Fix TSMesh::castRay() and small collision mesh 
This is the fix outlined in
https://github.com/GarageGames/Torque3D/issues/485
 2013-11-05 15:40:48 -05:00
DavidWyand-GG f10a860bba Changes for MaskNodeHandsOff 
This is a rework of the Pull Request
https://github.com/GarageGames/Torque3D/pull/453 based on my own
understanding of the issue.  The details may be found in the description
of the original Pull Request.
 2013-10-22 18:18:02 -04:00
cpusci 7a8f46b19f Update for float, double and unsigned char, unsigned short, short, etc. char was left alone: read why here http://msdn.microsoft.com/en-us/library/cc953fe1.aspx 2013-08-04 16:58:59 -05:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Thomas Fischer 53abbe066d added checks for valid pointers after locking 2013-06-30 17:51:38 +02:00
DavidWyand-GG e4df92a7bc Theora texture for cloned material fix 
When a TSShapeInstance makes a copy of its own materials through
cloneMaterialList() (such as done with client side ShapeBase objects),
the reference to a named diffuse render target was being lost.  This
affected using a TheoraTextureObject on a ShapeBase derived object
(StaticShape, etc.).
 2013-05-13 16:49:12 -04:00
DavidWyand-GG 30144a9f98 TheoraTextureObject 
Places a theora video onto a named texture surface that may be used by
any material.  Allows for the video to play, pause, stop, loop, and for
the source video to be changed at any time.

Based on this resource:
http://www.garagegames.com/community/resources/view/21019
 2013-04-23 11:24:05 -04:00
David Wyand 2dcc7f0247 Merge pull request #310 from thecelloman/goodbyeDIF 
Remove Interior Object format (DIF)
 2013-04-20 13:44:11 -07:00
DavidWyand-GG bfec2dfd79 Fix texture and object console paths 
- Be sure to delete all prefs.cs files following this change.
- Changes the console types of the missing, unavailable and warning
texture paths.  The old type was causing string corruption when saving
preferences.
- Changes the console type of the TSShapeConstructor collision shapes.
The old type was causing string corruption when saving preferences.
- Changed missing texture reference in ProcessedMaterial from String to
const char*.
 2013-04-09 10:05:57 -04:00
thecelloman b4ea1123dc Remove Interior Object format (DIF) 2013-04-05 12:39:26 -04:00
DavidWyand-GG 4b1334db9f Removed hard coded directory paths 
- Removed references to core directory.
- Switch some references to tools directory
- Added preferences variables where appropriate
 2013-03-07 18:56:53 -05:00
DavidWyand-GG 59aaaf1892 Merge branch 'consolefuncrefactor' of https://github.com/jamesu/Torque3D into consolefuncrefactor 2013-01-07 12:09:22 -05:00
DavidWyand-GG 595119590d Fix for Issue #155 for Billboard Creation 2012-11-26 11:03:42 -05:00
DavidWyand-GG a803398eb0 Fix for Issue #130 for Decals and Smoothing Groups 2012-11-08 16:56:22 -05:00
DavidWyand-GG 05b3a32e2c Fix for Issue #118 for Collada Importer Materials 2012-11-07 19:09:51 -05:00
jamesu 08d4f6ebc0 Improvements to console refactor code 
- Prevent stack corruption in a few places
- Use correct type in printfs
- Reduce type conversions in EngineApi & dAto*
- Fix compilation on GCC
- Tidy up code
 2012-10-12 19:12:06 +01:00
James Urquhart 38c8e52c1d Beginnings of the "pass everything using a native type wrapper" console code. 
- ConsoleValue class is now the base value class.
- ConsoleValueRef is now used to supply function parameters. Values are disposable.
- Script functions return values instead of just strings where possible.
- Variables can be disposable strings
- Bytecode changed

Fix the issues with console method parameters and fields which prevented missions from loading.
 2012-10-12 18:56:17 +01:00
David Wyand 75d9470029 Fix for Issue #66 for Skinned mesh crash 2012-10-04 19:06:43 -04:00
David Wyand a6f54b7b44 Merge pull request #57 from DavidWyand-GG/issue56-ShapeEditorSaveCrash 
Fix for Issue #56 for ShapeEditor save crash
 2012-10-03 15:10:44 -07:00
David Wyand a1a5a2c3d7 Fix for Issue #56 for ShapeEditor save crash 2012-10-03 18:06:15 -04:00
bank 12dbf49533 Fixed building on GCC 4.7.x 2012-09-30 02:32:31 +04:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00