Commit graph

3065 commits

Author SHA1 Message Date
Jeff Hutchinson
301bfb4ce7 Merge branch 'Preview4_0_DevHead' into high_resolution_timer 2020-12-30 16:18:56 -05:00
Brian Roberts
578846ab6f
Merge pull request #428 from Areloch/ConsolidatedTerrainCreation
Consolidates and standardizes terrain creation between the editor, asset browser and creator panel
2020-12-29 01:29:34 -06:00
Brian Roberts
1fbf46fa90
Merge pull request #425 from Areloch/MaterialMacroMagic
Initial pass at implementing MaterialAsset macromagic utility functions
2020-12-29 00:40:46 -06:00
Areloch
f7ce1efd62 Consolidates and standardizes terrain creation between the editor, asset browser and creator panel
Also shifts terrain data importing into the new terrain asset window instead of separate in the File menu
Also removes redundant loadMaterials call that caused duplicates in the Terrain Painter material list
2020-12-28 23:43:56 -06:00
AzaezelX
482e836797 membervar compile fix 2020-12-28 17:18:19 -06:00
Jeff Hutchinson
dee89e25b8 Changes profiler to use the high precision timer built into windows.
Also removes the legacy GetTickCount() fallback as that is no longer necessary in modern versions of windows (Windows XP and greater support QueryPerformanceCounter)
2020-12-28 18:14:21 -05:00
Areloch
3b111b14cc
Merge pull request #417 from Azaezel/alpha40_shapeMacroMagic
corrected and implemented a usage of shapeasset macros
2020-12-28 00:15:04 -06:00
Areloch
baeabb4a51
Merge pull request #413 from Azaezel/alpha40_ServerAssetValidator
add validation flagging for server objects
2020-12-28 00:14:46 -06:00
Areloch
c1cd217557 Initial pass at implementing MaterialAsset macromagic utility functions and applies it to the renderMeshExample object as well as groundPlane 2020-12-27 23:24:29 -06:00
Lukas Aldershaab
0594e13e07 OpenGL: Access viewtangent "DX" style for gbNormal in terrain textures 2020-12-26 12:49:34 +01:00
AzaezelX
516a05301f corrected and implemented a usage of shapeasset macros (and stray membervars touched). todo: shapebaseimage, debris. 2020-12-22 12:34:15 -06:00
Brian Roberts
e9dba74891
Merge pull request #375 from Areloch/LoopmodePathManager
Adds handling to the path manager so it can deal with both looping and non-looping paths
2020-12-21 03:05:00 -06:00
Brian Roberts
52ecd8bb0f
Merge pull request #395 from Areloch/MarkActiveScene
WIP of marking active scene in the scenetree
2020-12-19 02:35:58 -06:00
Brian Roberts
7dc6fc8abf
Merge pull request #415 from Areloch/GroundPlaneAssetify
Converts GroundPlane to utilize assets
2020-12-19 02:35:32 -06:00
Brian Roberts
78a836e433
Merge pull request #409 from Azaezel/alpha40_assetPipeCleanups
asset pipe cleanups
2020-12-19 02:34:57 -06:00
Areloch
fb5195dd44 Corrects groundplane assigned material in the example and editor levels
Assetifies GroundPlane's handling of it's material field
2020-12-19 01:43:52 -06:00
Areloch
3821ddd15a Merge branch 'GroundPlaneAssetify' of https://github.com/Areloch/Torque3D into Preview4_0 2020-12-18 14:12:54 -06:00
Areloch
8f60d03830 Adjusts Asset Importer logic when looking up and saving out a newly created ShapeConstructor so that it doesn't duplicate a definition it one already exists.
Adds _ORM and -ORM suffixes for PBR-ORM map import rule
Tweaks naming convention for IgnoreNode/Meshes and ImportNode/Meshes to be clearer via the prefix 'Always'
Fixes a token typo in suffix parsing, and adds \t to token deliniation for all suffix parsing to asset importer
2020-12-18 00:55:01 -06:00
AzaezelX
6408297eb9 add validation flagging for server objects
sets up a generic `ServerAssetValidator` PersistenceManager onServerCreated and saves anything marked dirty after processing. demonstrates looking that up and setting something dirty via shapebase::preload asset tagging
2020-12-16 21:31:54 -06:00
Areloch
533ff28814 Corrects recursive path dump so it can actually recurse correctly on linux. This fixes module/asset scan lookups
Also added logic to more correctly get the base path of executable, making it easier for certain debuggers, like on linux, to find the main.cs.
2020-12-15 11:04:15 -06:00
AzaezelX
b26c87491f need to ensure we've got an asset at all before setting the loaded state 2020-12-14 13:33:49 -06:00
AzaezelX
f95a78d2e8 misc asset pipeline cleanups
AssetImporter::validateAsset make sure the modelDef looked for is valid
AssetImporter::importShapeAsset had a stray +"_"+embeded in it when it came to stitching togeather filenames and extentions
2020-12-14 13:32:45 -06:00
Brian Roberts
484ad73719
Merge pull request #407 from chaigler/wrap_mat_anim_floats
Wraps material animation floats to sane values.
2020-12-14 13:23:06 -06:00
Areloch
334cd1d205 Adds function to better report active device type from GFXDevice
Ensures Window title and options menu correctly displays available and active render api
Fixes AA option so it correctly toggles FXAA
2020-12-12 23:04:50 -06:00
chaigler
c342e84bec Wraps material animation floats to sane values.
Wraps material animation floats to sane values to prevent floating point drift.
2020-12-12 20:07:01 -05:00
GoldenThumbs
d168df03e0 Correct bump map in waterObject.cpp being in sRGB space 2020-12-11 19:07:19 -06:00
Brian Roberts
5534384c54
Merge pull request #390 from Azaezel/alpha40_assetErrorcodes
variation on #387 that also introduces errorcodes
2020-12-08 23:50:07 -06:00
NoboKani
a56fe4037e Fixing bug Terrain Editor bug #91 2020-12-08 22:12:45 +03:00
Brian Roberts
d18721d78e
Merge pull request #398 from Azaezel/alpha40_fixCubeMips
mMipCount was never being filled out. just use mPrefilterArray->getMi…
2020-12-05 12:36:49 -06:00
AzaezelX
53f9f49410 mMipCount was never being filled out. just use mPrefilterArray->getMipMapLevels() direct 2020-12-05 00:04:19 -06:00
Areloch
87217e2365 Removes unneeded redundant asserts when the functions already have range sanity checks 2020-12-04 11:22:25 -06:00
AzaezelX
ae5f766abe just to save a PR: default asset visitor variables to emptystring 2020-12-03 15:38:42 -06:00
AzaezelX
8bb43dd5ae error string interpreter, example of usage in shapebase::preload, plus flips the datablock filter back on to save some network bandwidth. 2020-12-03 15:37:51 -06:00
Areloch
27cf3466c3 WIP of marking active scene in the scenetree 2020-12-03 00:31:23 -06:00
Areloch
e8564680e4 Better handling for finding modules by file path. Mainly used in asset importer 2020-12-02 23:57:17 -06:00
AzaezelX
220771d2fe variation on #387 that also introduces errorcodes 2020-12-01 19:16:36 -06:00
Brian Roberts
80eb4ab2ba
Merge pull request #386 from Azaezel/alpha40_createCompositeCopypasta
adress #385
2020-11-29 21:04:58 -06:00
AzaezelX
0fa8e23475 adress #385 2020-11-29 21:04:11 -06:00
AzaezelX
c626bc10e0 get shapeassetID read. TODO: find further flaws and unrem the filter 2020-11-27 19:03:20 -06:00
Brian Roberts
6441ecd941
Merge pull request #317 from Areloch/ShapeBaseDataAssetify
Implements hook-look-up logic for shape assets to ShapeBaseData including autoimport handling
2020-11-27 18:04:16 -06:00
Areloch
efa84660bc Added handling for gamepad key input consumption as well. 2020-11-21 02:52:39 -06:00
Areloch
bca972ae24 Adds a flag to the guiGameListMenuCtrl to allow consuming of key input events. This allows for overriding other active keybinds that may be in play when a menu is active. 2020-11-21 02:35:05 -06:00
Lukas Aldershaab
44dcdc7515 Revert wrong rename of addEffect in comment 2020-11-15 21:37:54 +01:00
Lukas Aldershaab
9c4191702c Properly specify type of console types with a different native type 2020-11-15 21:32:29 +01:00
Lukas Aldershaab
763c205451 Add type of Children in SimGroup and GuiControl 2020-11-15 21:32:29 +01:00
Lukas Aldershaab
55f459cf2d Add missing call to CInterface::IsMethod 2020-11-15 21:32:29 +01:00
Lukas Aldershaab
97edf1ae34 Remove duplicate definition of glowMul 2020-11-15 21:32:29 +01:00
Lukas Aldershaab
158bf5528c Remove name-clashes in AFX code-base 2020-11-15 21:32:29 +01:00
Lukas Aldershaab
f4c8e2683e Improve type detection of EngineAPI types 2020-11-15 21:32:29 +01:00
Lukas Aldershaab
a7f3724dd1 Handle MatrixF default values 2020-11-15 21:32:29 +01:00