Commit graph

294 commits

Author SHA1 Message Date
suncaller 7f7e402c42 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
Areloch 3a71c75596
Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Azaezel f618ba8e0f alternative to #2268 : remove secondary profiling 2018-07-27 22:00:49 -05:00
Areloch e6e5e24d23
Merge pull request #2247 from rextimmy/d3d11_tex_lock_fix
Corrects a problem with the D3D11 texture lock/unlock mechanism
2018-07-12 15:17:49 -05:00
rextimmy 3b0c00498b d3d11 copyToBmp fix for new lock/unlock function 2018-07-10 14:13:22 +10:00
Areloch cc906b95c2
Merge pull request #2265 from OTHGMars/vmParseFromString
Fix for bug in GFXVideoMode::parseFromString()
2018-07-09 13:56:12 -05:00
OTHGMars e3f675768c Fix for bug in GFXVideoMode::parseFromString()
When testing PR #2264 I discovered that GFXVideoMode::parseFromString() will never assign false to the fullScreen value. That value must be initialized to false going in. I found it hard to believe that that could be the case and not have caused a problem before now, so I dropped:
```c++
   GFXVideoMode vmTest = GFXInit::getDesktopResolution();
   vmTest.fullScreen = true;
   vmTest.parseFromString("800 600 false 32 60");
   Con::printf("%s becomes %s", "800 600 false 32 60", vmTest.toString().c_str());
```
into the end of _GFXInitGetInitialRes() and the output string is:
800 600 false 32 60 becomes 800 600 true 32 60 0

None of the values get assigned by the macro [here](https://github.com/GarageGames/Torque3D/blob/development/Engine/source/gfx/gfxStructs.cpp#L46-L48) if their function evaluates to zero or the token is missing from the string. This commit corrects that for the boolean case to only skip the assignment if the string token is not found.
2018-07-07 02:23:59 -04:00
chaigler 8992744856 _GFXInitGetInitialRes() cleanup
Removes unnecessary code that sets default video mode params. This is
already handled by the GFXVideoMode constructor. The settings are also
immediately overwritten by vm.parseFromString().

Resolves #740
2018-07-05 14:19:05 -04:00
Areloch 36db8eacc3
Merge pull request #2236 from Azaezel/memberMess
cleans up all 'hides' warnings (at time of writing)
2018-05-30 20:36:43 -05:00
rextimmy 395c7af5b6 Corrects a problem with the D3D11 texture lock/unlock mechanism 2018-04-21 18:19:17 +10:00
Lukas Joergensen 00758d380f Eliminate unnecessary uses of ConsoleFunction 2018-04-17 21:41:29 +02:00
Lukas Joergensen cdfd4f9735 Eliminate DefineConsoleStaticMethod 2018-04-17 21:03:16 +02:00
Lukas Joergensen 3c99ef73a9 Eliminate DefineConsoleMethod 2018-04-17 21:01:50 +02:00
Lukas Joergensen 5bde18143f Eliminate DefineConsoleFunction 2018-04-17 20:54:08 +02:00
Azaezel 28e509af1a 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 3cec0f9d98 augmentation to drawArrow to allow one to explicitly define a radius. 2018-03-27 14:57:23 -05:00
Azaezel 870acaf5e4 gfxDrawutil, gizmo shadowvar cleanups 2018-03-15 20:44:13 -05:00
Glenn Smith 6b024b21bf As suggested, extract strlen calls from sizes into variables so it isn't called twice 2018-03-08 20:59:40 -05:00
Glenn Smith a94587af43 Use strncpy instead of strcpy because again, buffer overflows 2018-03-06 02:35:33 -05:00
Glenn Smith 1728fe39ad Use strncat instead of strcat to prevent some buffer overflows 2018-03-06 00:48:44 -05:00
Azaezel f9ab317f65 companion to #2203: corrects a couple backend profile assignment mismatches found with @rextimmys debug spew 2018-02-13 02:51:28 -06:00
Areloch 86756bd929 Loader files didn't properly get deleted with the libmng and lungif library removal. 2018-01-10 09:49:28 -06:00
Areloch 4509d14df3 Merge pull request #2057 from OTHGMars/GFXFormatStrs
Adds missing GFX Texture format strings
2017-09-21 16:56:15 -05:00
Areloch 6ca8ca4d83 Merge pull request #2086 from Azaezel/ProfileProblemPing
textureProfile conflict reporting
2017-09-14 22:19:01 -05:00
Azaezel ee14bb923e from@rextimmy: reports the same texture used with 2 conflicting textureProfiles (flipping back and forth causes duplicates) 2017-09-14 13:28:13 -05:00
rextimmy 505b9fbd12 Corrects OpenGL projection matrix
Corrects OpenGL glPolygonOffset values
Corrects Direct3D11 DepthBias values
2017-08-25 13:13:47 +10:00
rextimmy 56ba98ac12 Fix potential crash with D3D11 2017-08-12 19:24:09 +10:00
Areloch e2d3eeffaf Merge pull request #2055 from Areloch/CommonShaderPath_Improvement
Reworks the $Core::commonShaderPath variable usage
2017-08-04 00:58:34 -05:00
Areloch 9831dc947d Merge pull request #2041 from Azaezel/clearTextureStateImmediate
method to make sure we're not getting pixel shader inputs mixed with …
2017-08-04 00:58:13 -05:00
OTHGMars ba401dbc72 Adds missing GFX Texture format strings
This commit eliminates 5 warnings output from VALIDATE_LOOKUPTABLE here: https://github.com/GarageGames/Torque3D/blob/development/Engine/source/gfx/gfxStringEnumTranslate.cpp#L167
And prevents a fatal error here: https://github.com/GarageGames/Torque3D/blob/development/Engine/source/gfx/gfxTextureManager.cpp#L1371
that occurs when called from GuiOffscreenCanvas::_setupTargets() for an OpenVROverlay because GFXFormatR8G8B8A8_LINEAR_FORCE  is used.
2017-07-27 16:49:02 -04:00
Areloch 7567ca10c3 Reworks the $Core::commonShaderPath variable usage to be a static variable in ShaderGen for efficiency(only one getVariable when shadergen is initialized), as well as implements the ability to set a default value, and ensures that it tries to set a path even if the pref variable is missing which is important for ported projects from older builds. 2017-07-24 00:40:27 -05:00
Azaezel 6813f255d0 method to make sure we're not getting pixel shader inputs mixed with outputs. 2017-07-09 15:15:30 -05:00
rextimmy 8bdccb3ff3 DDS cubemap support 2017-07-07 15:59:02 +10:00
Areloch 60b1922bc5 Includes the D3D feature level detection. 2017-07-05 22:27:37 -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
Areloch 7e5e3b5105 Removes Direct3D9 functionality. 2017-05-28 16:51:31 -05:00
OTHGMars 77da6900a8 Prevents GFXDrawUtil::drawTextN() from drawing one character more than requested if in_string has more than n characters. 2017-05-12 18:54:01 -04:00
Areloch 19dcfde60f Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Areloch ab51befa68 Merge pull request #1979 from Azaezel/purdyPitureProfiler
adds profiling to the various gbitmap loaders*
2017-04-26 01:01:54 -05:00
Masquara 970dd5c477 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Azaezel f889aebcea adds profiling to the various gbitmap loaders*
*note, DDS bypasses the gbitmap method chain in question.
2017-04-10 21:43:38 -05:00
Areloch 26fd24fbab Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Thomas "elfprince13" Dickerson f7ce30f42c Merge branch 'development' of github.com:GarageGames/Torque3D 2017-03-07 20:08:17 -05:00
Thomas "elfprince13" Dickerson d3956cb532 merged numerous changes from upstream 2017-03-03 21:17:07 -05:00
Areloch d680dc9934 Initial implementation of the new Base Game Template and some starting modules.
This makes some tweaks to the engine to support this, specifically, it tweaks the hardcoded shaderpaths to defer to a pref variable, so none of the shader paths are hardcoded.

Also tweaks how post effects read in texture files, removing a bizzare filepath interpretation choice, where if the file path didn't start with "/" it forcefully appended the script's file path. This made it impossible to have images not in the same dir as the script file defining the post effect.

This was changed and the existing template's post effects tweaked for now to just add "./" to those few paths impacted, as well as the perf vars to support the non-hardcoded shader paths in the engine.
2017-02-24 02:40:56 -06:00
Areloch 501b55d939 Adds a check to the record movie call so that it only happens in Release mode, to avoid crash issues with theora and debug mode. 2017-01-30 20:36:48 -06:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
rextimmy f6d624be8f Fix mipmap count and potential crash for non square textures that are allocated with GBitmap class 2017-01-16 15:36:52 +10:00
Areloch 0c6174b045 Merge pull request #1920 from elfprince13/variadicConsoleTemplates
Variadic console templates
2017-01-12 23:32:03 -06:00
Thomas "elfprince13" Dickerson bcc5459818 whitespace 2017-01-11 23:34:46 -05:00