Commit graph

2824 commits

Author SHA1 Message Date
Brian Roberts
b98d0a946b
Merge pull request #209 from Azaezel/alpha40_ScopeStackShenanigans
adress #203
2020-06-20 05:32:04 -05:00
Brian Roberts
f6cedc8043
Merge pull request #210 from Azaezel/alpha40_spotlightBoundsFix
adress #162 based on work by Chad Hall
2020-06-20 05:29:47 -05:00
Brian Roberts
cc0d4f4d6b
Merge pull request #222 from Azaezel/alpha40_kill_macroMaps
adress #221 crash surpress macromap
2020-06-20 05:28:33 -05:00
Brian Roberts
e3052a1919
Merge pull request #202 from Azaezel/alpha40_GL_CubemapSaver
implement copyResource, fix copyToBmp
2020-06-20 05:27:53 -05:00
AzaezelX
4a88d7a4e4 adress #221 crash surpress macromap
while shifitng loop in _initSamplerNames to use sgMaxTerrainMaterialsPerPass. if folks absolutely require thier projects to contain terrain macromaps, they can unrem

FEATUREMGR->registerFeature( MFT_TerrainMacroMap, new NamedFeatureGLSL("TerrainMacroMap Deprecated")); // new TerrainMacroMapFeatGLSL);
   //samplerNames.push_back("$macrolayerTex");
and
      //samplerNames.push_back(avar("$macroMap%d", i));
as well as turn sgMaxTerrainMaterialsPerPass down to 2 entries on a given terrain subchunk before it requires another rerender of the terrain blended in with prior passes.
2020-06-19 21:12:20 -05:00
Brian Roberts
73d57e86af
Merge pull request #213 from Azaezel/alpha40_gl_terrainfix
typofix in opengl terrain shadergen
2020-06-19 19:50:37 -05:00
Brian Roberts
2ef6008212
Merge pull request #216 from Azaezel/alpha40_groundcover_tricks
groundcover requested augs
2020-06-19 18:37:40 -05:00
Brian Roberts
e010d02809
Merge pull request #214 from Azaezel/alpha40_ststatic_tricks
adds an animspeed and animoffset to tsstatic instances
2020-06-19 13:29:03 -05:00
AzaezelX
206d86f1bb .. we do however appear to need to swizzle DX vert colors... 2020-06-19 06:48:50 -05:00
AzaezelX
6859cbe308 adress #16 - don't need to swizzle vert colors 2020-06-13 13:02:56 -05:00
AzaezelX
7c9d2f3ca2 groundcover requested augs
1) fadescale- allows an enduser to reduce drawdistance for groundcover via $pref::GroundCover::fadeScale
2) adds minslope, conformtonormal, and min/max rotations along the x and y axies
2020-06-13 12:18:41 -05:00
AzaezelX
136bc8874f adds an animspeed and animoffset to tsstatic instances so clones can be set to break up syncing on multiples 2020-06-13 12:08:01 -05:00
AzaezelX
494049c4f6 typofix in opengl terrain shadergen 2020-06-13 12:02:16 -05:00
AzaezelX
16a159992f adress #162 based on work by Chad Hall 2020-06-12 14:38:19 -05:00
AzaezelX
06abd3f1eb adress #203 2020-06-12 13:25:53 -05:00
Marc Chapman
913c8753d0 Linux Slash compatability 2020-06-12 06:24:54 +01:00
AzaezelX
4043015d2d adress #205 2020-06-10 11:52:47 -05:00
AzaezelX
4223a26f05 no message 2020-06-07 18:00:17 -05:00
AzaezelX
81a4e47235 crashfix-string deconstructor
validate we aren't either empty or using the reserved empty string before we release the pointed to value (as a note, the latter at least shouldn't have been required, but might as well be paranoid about it)
2020-06-02 17:10:39 -05:00
Areloch
69089e1ee2 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0_MenuUIRework 2020-06-01 03:48:20 -05:00
Areloch
a561d590ca Minor cleanups to guiGameListMenuCtrl 2020-06-01 03:32:45 -05:00
Areloch
3b47d41da2 Majority of options menu integration completed
Implemented keybind option type
Updated Pause menu to comply with new style
2020-05-25 00:51:33 -05:00
Areloch
bc27125e90 Initial pass to rework and cleanup the main UI interface
Implements interface buttons that react to input type and visually display keybinds
Updates the T3D icon and splash screen
2020-05-20 17:19:52 -05:00
Areloch
6a5661ddc7 Corrected some path-slash wrongness 2020-05-17 15:27:16 -05:00
Areloch
9b7b09dce8 Adjusts the ShapeAsset autoImport invoke logic to actually use the C++-side autoImport logic
Changed originalImportingAssets to originalImportingFiles in the AssetImporter for naming clarity
Made autoImportFile properly return the assetId that was made
Additional logging in the AssetImporter
Adjusted the asset registration logic to support reimports, which merely refreshes the assetID
Added logic to shape asset importing to be able to import in an existing companion constructor cs file
Tweaked the TSStatic setShapeName logic so it will properly set fields depending on if the assetID was correctly set, or if we have the noShape fallback in use
2020-05-17 01:38:17 -05:00
Areloch
3f0195475d Merge branch 'alpha40TerainLayerHack' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:19:02 -05:00
Areloch
240aa571de Merge branch 'alpha40_explodeNorm' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:18:35 -05:00
Areloch
2c2c9659e1 Merge branch 'alpha40_HiddenHugs' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:17:24 -05:00
Areloch
638a515702 Merge branch 'alpha40_BandingBreakup' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:16:52 -05:00
Areloch
9b907e77ee Swaps some references from the windows SDK-specific FLT_MAX to T3D's F32_MAX
Takes the makeFullPath in findTSShapeConstructor and turn it into a string before passing it along to the Filename to make stricter compilers happy
Removed some referenced to fields that don't exist in the current build
Removed unneeded ASM language activation for the cmake files
Adjustments to material map assembling macros to better comply to stricter compilers
2020-05-13 02:10:11 -05:00
Areloch
39d9e6039c Merge branch 'alph40_cleanups' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-05-13 01:29:58 -05:00
AzaezelX
ebb7ed1b78 uninitialized variables-math 2020-05-11 16:17:40 -05:00
AzaezelX
5f59ebbacc uninitialized variables-materials 2020-05-11 15:59:22 -05:00
AzaezelX
36cbc4c962 uninitialized variables-verve 2020-05-11 15:53:14 -05:00
AzaezelX
43259e29c1 uninitialized variables-util 2020-05-11 15:46:44 -05:00
AzaezelX
9e1c22204f uninitialized variables-ts 2020-05-11 15:40:55 -05:00
AzaezelX
c2e74f375a uninitialized variables-terrain 2020-05-11 15:37:43 -05:00
AzaezelX
fabd5864fa uninitialized variables-t3d 2020-05-11 15:30:21 -05:00
AzaezelX
87603029db uninitialized variables-sim 2020-05-11 15:26:52 -05:00
AzaezelX
a1a6143e01 uninitialized variables-sfx 2020-05-11 15:24:49 -05:00
AzaezelX
7392d598da uninitialized variables-scene 2020-05-11 15:20:03 -05:00
AzaezelX
8aa03a4ac9 uninitialized variables-renderinstance
(cherry picked from commit dcbc22bf8450250f192ae56b303affd760f63db1)
2020-05-11 15:17:09 -05:00
AzaezelX
522578074c looks like distance needs to default to 0, not max, for raycast purposes.
(cherry picked from commit 00ee743559e19bc2dd3cbf92060b8bf089d5aceb)
2020-05-11 15:15:48 -05:00
AzaezelX
bd8a72005e uninitialized variables-platform
(cherry picked from commit 36fd324de7a29a8f4bb84b7622ae925acb1d3760)
2020-05-11 15:15:01 -05:00
AzaezelX
bfcc83638d uninitialized variables-core-2
(cherry picked from commit 7c329699e4e4d13a164b2483e174b5f555ea9344)
2020-05-11 15:13:29 -05:00
AzaezelX
b6c33bdd2b uninitialized variables-persistence 2020-05-11 15:12:50 -05:00
AzaezelX
a46bf3d7e5 uninitialized variables-navigation 2020-05-11 15:08:57 -05:00
AzaezelX
f52c3d5ed2 uninitialized variables-lighting 2020-05-11 15:07:21 -05:00
AzaezelX
9fef1b3cd1 uninitialized variables-gui 2020-05-11 15:03:27 -05:00
AzaezelX
b9c207765e uninitialized variables-gfx 2020-05-11 15:00:25 -05:00