Commit graph

169 commits

Author SHA1 Message Date
Areloch 35d649b57e Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -05:00
rextimmy 3cb5f6ca21 ColorI::fromLinear fix 2017-08-13 19:39:44 +10:00
Marc Chapman d28a416914 packet-overflow-checks -- Monitor packet sizes to avoid packet overflow, especially when dynamic variables are used for AFX effect parameterization. 2017-07-26 22:22:23 +01: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
Phillip Khandeliants 172391e1d3 Fixed V610: Undefined behavior
In an arithmetic expression, all the variables whose values can be represented with type 'int' will be promoted to this type. Therefore, the result of the '~mask' expression is a negative number. By the C++ standard, shifting a negative number to the left leads to an undefined behavior.
2017-04-27 12:13:05 +03:00
Phillip Khandeliants 32c5ada995 Fixed V591: Non-void function should return a value
If there is needed to prevent the copying of the object, then there is no need to provide the definition of the copy constructor and the assignment operator, because the member functions and friendly functions can still call them. If the code is compiled by a compiler with support for the C++11 standard, you can delete them using the keyword 'delete'
2017-04-27 10:33:31 +03:00
Areloch 0637f39928 Merge pull request #1988 from DTFuchs/Redundant-Check-GetTrailingNumber
Better bug fix for #1738 (str.cpp)
2017-04-26 23:27:17 -05:00
Areloch 19dcfde60f Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
DTFuchs 3121f30743 Update str.cpp 2017-04-23 18:49:08 -04:00
Masquara 970dd5c477 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch c443e7a4ae Merge branch 'development' into Xenon_Removal 2017-04-18 20:47:43 -05:00
klaus95 5378abfc55 Fix for bug #1738
getTrailingNumber("string") and stripTrailingNumber("string") will now work for single letter cases. For example, getTrailingNumber() will return "11" if the input is "a11" or "t11", and stripTrailingNumber() will return "a" if the input is "a11".
2017-04-17 15:46:44 -07: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
Anis 55b7a8431c Merge pull request #1800 from Azaezel/andOrMaybe
clang reports: unclear || + && and &+| mixes.
2017-01-07 02:31:05 +01:00
Azaezel d42b1a6be8 colorPicker/swatch srgb display.
dependency from @rextimmy: tolinear and togamma for color+lumnance.
2016-12-22 06:37:34 -06:00
Azaezel dd071484da Merge branch 'development' of https://github.com/GarageGames/Torque3D into andOrMaybe
Conflicts:
	Engine/source/T3D/staticShape.cpp
2016-12-20 22:50:28 -06:00
James Urquhart 704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
Areloch fd99f976a6 Merge pull request #1798 from Azaezel/UUID_unmangle
clang: format_token string format correction
2016-10-24 01:27:38 -05:00
Anis 60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2
more unused variable cleanups
2016-10-23 21:04:36 +02:00
Anis bd4f2b002d Merge pull request #1801 from Azaezel/registerRemoval
clang: register type modifier deprecated
2016-10-21 20:04:42 +02:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight
clang: constructor initialization order
2016-10-19 08:39:12 -05:00
Areloch 121d65215e Tweaks any enums that use uint_max values so that they have hard types to avoid any compiler kerfluffles with C++11 value narrowing, specifically pertaining to clang. 2016-10-17 01:00:12 -05:00
Azaezel 1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Azaezel fbfd3ed8ed clang: constructor initialization order
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
2016-10-14 18:16:55 -05:00
Azaezel dd0b7914e6 clang: register type modifier deprecated 2016-10-14 17:37:00 -05:00
Azaezel c57b1a8b70 clang reports: unclear || + && and &+| mixes. 2016-10-14 17:26:13 -05:00
Azaezel ae5f61e60d clang: format_token string format correction 2016-10-14 16:28:06 -05:00
Areloch 1131ed15df Merge pull request #1785 from rextimmy/mac_port_clean
MacOS platform support
2016-10-12 16:54:24 -05:00
Areloch e77642f6cb Merge pull request #1786 from jamesu/datachunker_mem
Reduce the amount of blocks of memory DataChunker uses
2016-10-09 13:56:42 -05:00
James Urquhart d324abd2df Fix redundant memcpy in swizzle ToBuffer method 2016-09-30 18:41:10 +01:00
James Urquhart c2cc7142de Reduce the amount of blocks of memory DataChunker uses 2016-09-30 18:35:14 +01:00
RexTimmy dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
RexTimmy 7b21b69dcb Revert TORQUE_CPU_X64 changes to oggTheoraDecoder.cpp 2016-09-17 10:52:43 +10:00
Areloch f88975121d Merge pull request #1761 from Bloodknight/intrinsicsfix
Intrinsicsfix
2016-09-13 21:43:18 -05:00
Anis 8cae1e5dcb Merge pull request #1749 from Azaezel/linearizeLights
adds toLinear and toGamma helper functions for ColorF, uses the former in adjusting lights.
2016-09-04 02:06:00 +02:00
Marc Chapman bcb56a027d Added x64 check for SSE2 OGG Theora Decoder 2016-09-02 05:10:28 +01:00
Azaezel 13f00ca79d adds toLinear and toGamma helper functions for ColorF, uses the former in adjusting lights. 2016-08-09 14:49:03 -05:00
Azaezel 76fe7937ce adresses C4189 warnings ('identifier' : local variable is initialized but not referenced) 2016-07-31 10:46:52 -05:00
Azaezel fc110706a3 corrects safety check for Stream::readLongString 2016-06-08 15:28:40 -05:00
Areloch 908be4818f Merge pull request #1519 from Azaezel/deferredShading
Deferred shading
2016-02-27 15:08:20 -06:00
Anis A. Hireche b3662d801a Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1334
# Conflicts resolved:
#	Engine/source/console/consoleFunctions.cpp
2016-02-26 21:58:01 +01:00
Anis 794f1b9536 Merge pull request #1532 from GarageGames/pr/1143
[CLONE] More consolefunctions #1143
2016-02-26 18:57:49 +01:00
Anis A. Hireche 10cb6ab9c4 Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1153 2016-02-26 14:39:38 +01:00
Azaezel 7a60056365 Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-21 16:07:51 -06:00
Anis 4c0d3bbc34 removed tabs 2016-02-21 22:41:35 +01:00
Azaezel ca2ffea6cd Merge branch 'development' of https://github.com/GarageGames/Torque3D into ColorPickerAdvanced 2016-02-21 15:30:54 -06:00
Azaezel 8c5810adad The final step (barring any overlooked missing bits, requested refactors, and of course, rolling in dependencies already submitted as PRs) consists of:
renderPrePassMgr.cpp related:
A) shifting .addFeature( MFT_XYZ); calls from ProcessedShaderMaterial::_determineFeatures to ProcessedPrePassMaterial::_determineFeatures
B) mimicking the "// set the XXX if different" entries from RenderMeshMgr::render in RenderPrePassMgr::render
C) fleshing out ProcessedPrePassMaterial::getNumStages() so that it shares a 1:1 correlation with ProcessedShaderMaterial::getNumStages()
D) causing inline void Swizzle<T, mapLength>::ToBuffer( void *destination, const void *source, const dsize_t size )  to silently fail rather than fatally assert if a source or destination buffer is not yet ready to be filled. (support for #customTarget scripted render targets)

Reflections:
A) removing reflectRenderState.disableAdvancedLightingBins(true); entries. this would otherwise early out from prepass and provide no color data whatsoever.
B) removing the fd.features.addFeature( MFT_ForwardShading ); entry forcing all materials to be forward lit when reflected.
C) 2 things best described bluntly as working hacks:
C1) when reflected, a scattersky is rotated PI along it's z then x axis in order to draw properly.
C2) along similar lines, in terraincellmaterial, we shut off culling if it's a prepass material.

Skies: scattersky is given a pair of rotations for reflection purposes, all sky objects are given a z value for depth testing.
2016-02-16 02:50:49 -06:00
Azaezel d25b03cd52 vsprintf replacement with engine vairant
resolves first issue in
https://github.com/GarageGames/Torque3D/issues/1515#issuecomment-184446719
2016-02-15 18:12:56 -06:00
Areloch 6235f63deb Merge pull request #1395 from Azaezel/AssertDivNULL
credit to @MusicMonkey5555 for spotting. asserts for Div/NULLs
2016-01-16 17:53:00 -06:00
Areloch 7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems.
Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00