TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-18 14:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4926 commits 5 branches 33 tags 958 MiB
Commit graph

4926 commits

This branch
This branch
All branches
Author SHA1 Message Date
rextimmy
5a933c00d3 Removed old fixed function code from GFX. 2021-01-05 12:57:17 +10:00
rextimmy
aad70af468 use const for consistency 2021-01-05 10:43:12 +10:00
rextimmy
511efcf462 Correct GFXD3D11TextureObject lock/unlock issues 2021-01-05 10:41:30 +10:00
Brian Roberts
58d2e30af7
Merge pull request #438 from lukaspj/fix/no-detail-in-terrain 
Improve terrain rendering, handle bug with no detail
 2021-01-04 14:27:15 -06:00
Lukas Aldershaab
481e2a7230 Improve terrain rendering, handle bug with no detail 2021-01-04 20:06:17 +01:00
Brian Roberts
27641b16ca
Merge pull request #424 from lukaspj/feature/new-terrain-blending 
Height based terrain texture blending
 2021-01-04 05:36:50 -06:00
Lukas Aldershaab
7ffe0f3c80 Fix default values for texture formats in UI 2021-01-04 11:48:00 +01:00
Lukas Aldershaab
88bdb594aa Set default terrain texture format 2021-01-04 10:26:08 +01:00
Areloch
bf5b26f734 Assetifies MeshRoad, Decal Road, and the material slot of GroundCover 
Creates a networked and non-networked variant of DECLARE_MATERIALASSET macro
 2021-01-03 08:58:53 -06:00
Lukas Aldershaab
6f57aa51d2 Add 0.5f term back to contrast calculation 2021-01-03 11:43:13 +01:00
Lukas Aldershaab
9cac064be8 Avoid negative heights in texture blending 2021-01-03 11:35:08 +01:00
Lukas Aldershaab
10ed852dd2 Remove baseline component from contrast 2021-01-03 01:49:07 +01:00
Lukas Aldershaab
26f09d9a97 Fail hard on unrecoverable mistakes in GFXTextureArray 2021-01-03 01:32:39 +01:00
Lukas Aldershaab
60a10f4334 Add global blendDepth slider and update default blendDepth for mats 2021-01-03 01:26:19 +01:00
Lukas Aldershaab
db496fa0c4 Make terrain texture settings global, add dialog to painter 2021-01-03 00:50:42 +01:00
Lukas Aldershaab
d3996aec84 Add texture size fields to terrain textures and improve editor performance 2021-01-02 18:33:18 +01:00
Lukas Aldershaab
9caa08b7f0 Fix off-by-one in mip levels for OpenGL 2021-01-02 18:19:26 +01:00
Brian Roberts
a0ba345095
Merge pull request #432 from Azaezel/alpha40/sdlwebGeneralization 
sdl usage standards proposal 3
 2021-01-02 11:09:52 -06:00
Brian Roberts
03e6b5b096
Merge pull request #433 from Azaezel/alpha40/shapeAssetErrorFollowups 
moar asset errorhandling
 2021-01-02 11:09:31 -06:00
Brian Roberts
ab4c19e5ff
Merge pull request #434 from Areloch/UpdatedCppAssets 
Adjusts handling of C++ asset types
 2021-01-02 11:09:13 -06:00
Areloch
07336d258d Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded) 
Also adds a few additional C++ template files to work with
 2021-01-02 01:58:15 -06:00
Lukas Aldershaab
3c165b7d45 Update blendContrast, add glsl support 2021-01-02 03:30:08 +01:00
Lukas Aldershaab
1ffec9ab56 Add blend contrast slider 2021-01-02 03:20:18 +01:00
Lukas Aldershaab
6f23dd191d Update core shader libraries to support texture arrays 2021-01-02 03:19:51 +01:00
Lukas Aldershaab
3c8d07a03e Cleanup and fixes 2021-01-02 02:08:22 +01:00
Lukas Aldershaab
f55e7f7a22 Terrain painter integration for height based blending 2021-01-01 21:07:12 +01:00
Lukas Aldershaab
4f472bf402 New terrain blending 2021-01-01 21:07:12 +01:00
Lukas Aldershaab
e92e945912 Refactor GFXTextureArray 2021-01-01 21:06:08 +01:00
Lukas Aldershaab
87dd7ffc4a Implement Singlepass Terrain Render 2021-01-01 21:06:01 +01:00
AzaezelX
5e8862dafc further info by request 2020-12-31 19:38:53 -06:00
AzaezelX
6495ee16c6 report shape file location that failed to load, set loaded status to badfilereference if getAssetById can't even find noshape 2020-12-31 18:54:31 -06:00
Brian Roberts
07b9887cdd
Merge pull request #430 from Azaezel/alpha40/macfixes 
mac fixes
 2020-12-31 14:50:59 -06:00
AzaezelX
254ac462b5 sdl usage standards proposal 3: 
again maintains fallbacks for folks that just don't want to use the lib (though if we do want to go that route, we'll likely want to re-review a few commits and put fallbacks, well, *back* at some point)
includes sdl in torqueconfig.h if in use to kill duplication.
adds a generic sdlPlatform.cpp for general methods, oneliners, and the like
 2020-12-31 14:44:39 -06:00
Brian Roberts
a0581dce2a
Merge pull request #429 from JeffProgrammer/high_resolution_timer 
High resolution timer fixes
 2020-12-30 19:37:52 -06:00
AzaezelX
6b53b6581a mac fixes 
1) add sdl token for referencing the parent directory of the aplication bundle when determining the root dir
2) shape and mateiral asset macro corrections for a few stray ## redundencies (space, ->, . ect are all conidered token sperators in and of themselves)
 2020-12-30 19:36:51 -06:00
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
d19cbd334b Fixed wrong field name on groundPlane in ExampleLevel 2020-12-29 00:37:40 -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
Brian Roberts
5eb99027d8
Merge pull request #418 from Azaezel/alpha40_sdl2_0_14 
update sdl2 to release 2.0.14
 2020-12-28 22:04:16 -06:00
Brian Roberts
aae264d1ac
Merge pull request #426 from Azaezel/alpha40/typofix 
membervar compile fix
 2020-12-28 17:18:38 -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
49a8c0ad36 Fix ORM maps in terrain textures 
Fix default target for Composite Terrain GLSL
 2020-12-26 20:02:37 +01:00
Brian Roberts
8b8f725fae
Merge pull request #421 from lukaspj/fix/opengl-terrain-normal 
OpenGL: Access viewtangent "DX" style for gbNormal in terrain textures
 2020-12-26 05:50:27 -06:00
Lukas Aldershaab
0594e13e07 OpenGL: Access viewtangent "DX" style for gbNormal in terrain textures 2020-12-26 12:49:34 +01:00