Commit graph

57 commits

Author SHA1 Message Date
Areloch
80c036b9b0 Merge pull request #2327 from Areloch/loadCachedDTS
Adds ability to skip loading of cached dts in enumColladaForImport
2019-03-30 16:33:37 -05:00
Areloch
05909cf897 Adds ability to skip loading of cached dts in enumColladaForImport 2019-02-23 21:34:11 -06:00
Areloch
9bf8337e4a Initial implementation of the Scene object for handling scenes/levels in a more consistent and deliberate way. 2019-02-23 15:55:28 -06:00
Areloch
6cf0c9e360 Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Lukas Joergensen
e718841467 Eliminate DefineConsoleFunction 2018-04-17 20:54:08 +02:00
Azaezel
0e3c128ec4 slimmed down shadowvar cleanups, plus removal of an unused membervar. 2018-04-02 03:06:58 -05:00
Azaezel
0c316dab46 Revert "collada/ts chain shadowvar and member var clenaups"
This reverts commit 3ce15b33eb.
2018-04-02 03:01:52 -05:00
Azaezel
9fbeb3e2d0 void ColladaUtils::ExportData::processData() var clarifications 2018-03-28 17:50:17 -05:00
Azaezel
cbce2ee805 Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
2018-03-28 15:42:34 -05:00
Azaezel
53ce915dcf collada/ts chain shadowvar and member var clenaups 2018-03-16 18:40:32 -05:00
Areloch
8dedcf456a Cleanup of export function to remove redundant arg
Removed unused var
Cleaned up collision export on convexShape
Added prefab export functionality
2018-03-04 16:03:39 -06:00
Areloch
787b8be82c Adds handling for the proper updated exporting of mesh for convexShapes 2018-03-04 15:10:44 -06:00
Areloch
49639a908f Expanded mesh baking functionality, now supporting baking of LODs and Collision meshes 2018-03-01 01:51:18 -06:00
Areloch
14ae287c0c Bugfixes and improvements for the animation component and related asset behavior.
Adds in ability to establish a shape animation asset as being cyclic or blended.
Adds functionality for blended animations to integrated into shapeAssets.
2018-02-04 14:31:28 -06: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
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
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
Alex Piola
d2d5b8d834 Fix zipped dts loading 2016-03-04 10:45:55 +01:00
Marc Chapman
ac7d6e6691 Updated paths for collada tdictionary.h 2015-12-13 03:33:39 +00: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
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
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
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
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
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
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
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
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
e7fb6a54de Fix: Added missing virtual destructors for classes with virtual functions. 2014-05-06 12:40:46 +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