TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 16:43:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
3943 commits 5 branches 33 tags 960 MiB
Commit graph

153 commits

Author SHA1 Message Date
Areloch
e5bbd12d4b Merge branch 'MatInstanceViewer' of https://github.com/Areloch/Torque3D into Preview4_0 
Fixed up forward IBL
Reimplemented old forward light shader code as a baseline so it can be updated to new PBR math
 2019-06-27 00:36:56 -05:00
Areloch
cc01c79dc3 Merge branch 'Assimp_Settings' of https://github.com/OTHGMars/Torque3D into Preview4_0 2019-05-25 01:08:16 -05:00
OTHGMars
7ddacc20f4 Import Options gui Update 
Updated import options gui with tree view, additional shape statistics and settings load/save options. See /Engine/lib/assimp/t3d_usage.md for usage tips.
 2019-05-21 01:19:35 -04:00
Areloch
2479d388f2 Implements a Material Instance viewer to the material editor to see a feature-filtered dump of the generated shaders for a given material. 2019-05-17 01:48:45 -05:00
Areloch
ae11d3548d Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development 2019-05-13 00:28:23 -05:00
Areloch
82881f0875 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
a928744b73 Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:16 -05:00
Areloch
54b4d2eaaf
Merge pull request #2311 from Bloodknight/TerrainSnapOffsetZ 
Snap to terrain Z offset.
 2019-05-04 14:25:03 -05:00
AzaezelX
97ec99f704 Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
 2019-05-01 23:18:31 -05:00
OTHGMars
4ee5fbfc12 Fixes import dialog display after showing the shape changed prompt in the ShapeEditor. 2019-04-25 16:05:21 -04:00
OTHGMars
98c22d0f1b Sequence timing options. 
This commit deals with the problem that the keyframe timestamps are not standardized. Seconds, milliseconds and ticks are used depending on the import format. There is no metadata or property that specifies the format used, so the option is exposed to the user as part of the import options gui.
 2019-04-22 06:52:59 -04:00
OTHGMars
a3b4e527c4 Adds Force Update Materials to import options gui. 2019-04-22 00:09:29 -04:00
OTHGMars
b32289b618 Initial value selections for import options gui. 2019-04-18 16:49:51 -04:00
OTHGMars
b92b7a3ade Changes default winding order to be CCW. 2019-04-15 23:04:47 -04:00
OTHGMars
6111eb466e Enables the assimp import options gui when loaded from the shape editor. 
Adds new assimp options to the importer gui.
Copies the importer gui to the BaseGame template.
 2019-04-15 19:03:10 -04:00
Areloch
8d85a56095 Failed to get the Scene changes for the Full template rolled up. This corrects that. 2019-03-31 22:12:38 -05:00
Areloch
852f82b8a5
Merge pull request #2000 from saxonschmauderer/patch-3 
Fix for bug #1975
 2019-03-31 14:45:15 -05:00
Areloch
7b01b42e15 Fixes a crash that comes from toggling the editors on and off, then clicking a menubar item 
Fixes the menubar not resizing with the Window
Fixes the Editors Menubar item not being repopulated if the editor was closed/reopened
Fixes the Physics menubar item not appearing if the editor was closed/reopened
Fixes issue where findMenu could fail if the StringTableEntry happened to trip against a different capitalization.
 2019-03-16 02:38:40 -05:00
Areloch
cf1d22ba1b Corrected the blending logic somewhat, added visualization modes for spec/diffuse probe influences, attenuation and contribution. 2019-02-17 03:47:40 -06:00
Areloch
b52799bbce Finished current cleanup/reorg. 
Temporarily disabled logic for forward render of probes to avoid data mangle. TODO: fix up forward once deferred math is locked in
Split probe modes out into distinct environmental probe objects
Removed the probes from tracking their own baked cubemap file paths and instead have a pref store it
Removed old probe shaders and materials that aren't used now.
Fixed mLastConst memory leak by removing nono line.
 2019-02-14 00:35:22 -06:00
Marc Chapman
0ffb99e7d4 Adds the capability to add a small offset to the Z value of items being told to snap to terrain 2019-02-12 03:14:01 +00:00
Areloch
0f7641a282 WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Azaezel
8e534dd0c9 Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Areloch
8c2e27057e
Merge branch 'development' into ConvexProxies 2018-12-09 15:34:12 -06:00
Areloch
8605c3115d Initial WIP of the Modern Editor Layout 2018-12-08 12:50:31 -06:00
Areloch
a25f188200 Added propagated multibake mode. 
Temporarily disabled Precapture post effect.
 2018-10-27 02:21:46 -05:00
Areloch
2be32ad737 Implementation of reflection and skylight probes. 
Moves lighting math to the diffuse/specular two-channel logic.
 2018-09-16 22:15:07 -05:00
Areloch
ef5e3a5271 Core implementation of Physical Based Rendering. 2018-09-15 20:19:57 -05:00
Ratfish Studios
7af34fa432 Rearranges the right-mouse click popup menus for the world editor and gui editors to a) be organized more logically and b) be more flexible. 
This also fixes some insecure behavior relying on %this value eval'ing, which has also been modified to be better.

Also fixes up some old calls for getting menubar menus by internal name, which is no longer supported, instead using the findMenu function call.
 2018-05-08 00:30:15 -05:00
Areloch
eb5af65daf Removes the folder insert for the scripted object creator grid, which was causing a UI screwup making the scripted objects overlap and jumble up. 
Also reorgs the popup controls to match what's in the BaseGame template's setup, which should fix editor popups.
 2018-02-12 00:02:20 -06:00
Areloch
2d05d9dd70
Merge pull request #2118 from Areloch/MenuAndPopups 
Refactors the Popup menus and GuiMenuBars
 2018-01-27 18:41:00 -06:00
Justin Knight
38a10e032b Fix forest editor failing to load forest because of space after object ID 2017-11-14 11:57:13 +00:00
Areloch
6a078b614f Prior commit had mangled files somehow. Fixed. 2017-11-12 11:42:44 -06:00
Areloch
253dd02096 Refactors the Popup menus and GuiMenuBars to remove unneeded duplication and platform-specific/deprecated code. 2017-11-11 01:21:48 -06:00
Areloch
9a207ca6b0 Adds functionality to automate convex proxy objects for appropriate types. Instead of having to manually convert a zone or portal or occlusion volume to convex to edit it's shape, then back again, simply entering the convex editor will automatically convert them to proxy convex shapes, with a special material to denote them. 
When the convex shape editor is exited, it converts them back to their original type, with the changes made to the proxy convex applied to them.
 2017-10-12 01:41:27 -05:00
Areloch
b7870c33f8 Sets the default grid snap size to 1 rather than 10. 1 Seems like a more neutral default value, and also makes it match the displayed '1' in the UI interface as the default as well. 2017-09-17 18:24:44 -05:00
Johxz
db41c6ef2e add nav path from inside of editor 2017-08-15 22:41:36 -05:00
Areloch
0801a3cca8 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
saxonschmauderer
632300740d Fix for bug #1975 
The change was made to the function that is executed when entering the world editor. The boolean variable for first person shooter was set to true, since the camera always defaults to first person on entering the world editor. On setting this boolean variable to be true, the correct camera setting will always be displayed on entering the world editor. This does not affect other camera labels.
 2017-04-30 16:39:05 -04:00
Azaezel
f1d315d51a adds an atGizmo option - for now drops a new object at a given singular mesh position. TODO: at the center of a given group. 2017-02-26 18:34:32 -06:00
Azaezel
4b1e2816a9 console spam cleanup 2017-02-22 16:51:50 -06:00
Azaezel
5e6826d9bd fixes snap-to-terrain toggle not displaying it's initially saved-off state. 2017-02-22 15:11:21 -06:00
Azaezel
ebdd441833 adds a useGroupCenter var/button to allow folks to use non-itterative snapping, and defaults it to do so (maintains prior functionality envelope) 2017-02-22 14:31:26 -06:00
Areloch
2db03e47e9 Fixes a crash when you try to delete things without being in selection mode in the forest editor. Adds a sanity check that everything is properly set up before attempting the delete action. 
Also adds a fix to the mesh item tab in the forest editor to correct odd selection behavior that could erroneously cause selection of two items in the list when you only clicked one.
 2017-02-04 22:45:49 -06:00
Areloch
f8b650f7a1 Reworks the open/close functions of the gui and world editors so they will properly toggle between and clean up when closed. 2017-01-21 17:11:54 -06:00
Johxz
260f108693 added torque SimView tool 2016-12-28 15:25:55 -06:00
Azaezel
d42b1a6be8 colorPicker/swatch srgb display. 
dependency from @rextimmy: tolinear and togamma for color+lumnance.
 2016-12-22 06:37:34 -06:00
Areloch
eb2d3a908a Tweaked the naming convention to a) be more in line with the prefab creation functions, and b) avoid common artist terminologies that may lead to confusion on what it does. 2016-12-11 23:02:13 -06:00
Areloch
1d754cbbad Makes it so prefabs can correctly 'export to collada' by running the buildPolyList function on it's children. 
Also adds a 'Bake Selection to Mesh' option to the tools menu in the editor to export the selected mesh to a collada file, and then replaces the selection with a TSStatic.
 2016-12-10 17:27:27 -06:00
Areloch
1e89337825 Merge pull request #1821 from Areloch/platformgenericmenucatch 
Sanity check for if the GuiPlatformGenericMenuBar class
 2016-11-26 02:01:32 -06:00