Commit graph

45 commits

Author SHA1 Message Date
Areloch 71c19a6151 Companion PR to #719
Adds the OGL side. redoing it to make sure the PR history is clean.
2015-08-28 00:27:08 -05:00
Areloch 95ab3a33a5 Merge pull request #719 from rextimmy/dxtnm-parallax-fix
Fix to allow parallax mapping with dxtnm textures via the red channel.
2015-08-27 23:59:20 -05:00
Daniel Buckmaster 497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning
Fix some issues flagged by cppcheck
2015-03-01 18:27:40 +11:00
Daniel Buckmaster 6822a78fcf Merge pull request #1067 from Lopuska/patch-13
bugfix #1066
2015-03-01 14:17:59 +11:00
Ben Payne 0ffd7f5620 Fix member vars left uninitialized in constructors 2015-02-20 18:41:51 -05:00
LuisAntonRebollo c78f38fe0b Remove some dead code from OpenGL shadergen. 2015-02-07 22:49:58 +01:00
Luis Anton Rebollo d90baad6fa Merge pull request #1100 from JeffProgrammer/glslShadergenDefineFix
Fixed define bug for OpenGL shadergen.
2015-02-07 22:46:13 +01:00
Luis Anton Rebollo 25a790103e Merge pull request #1116 from Lopuska/patch-16
Intel OpenGL - fix a crash/shader compile error when you activate Vertex...
2015-02-07 22:24:55 +01:00
Daniel Buckmaster 014b566014 Merge remote-tracking branch 'gg/development-3.6' into development
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
2015-01-29 21:17:38 +11:00
Daniel Buckmaster 68d3e84c08 Merge pull request #1115 from Lopuska/patch-14
Jeff Faust's terrain fix also in OpenGL
2015-01-28 21:04:33 +11:00
Luis Anton Rebollo be84142502 Merge pull request #1118 from Lopuska/patch-17
fix #1117
2015-01-24 22:59:06 +01:00
Anis 4ccf89ba8e fix to avoid a missing sampler name declaration 2015-01-21 14:39:05 +01:00
Anis 5d392e373e Update shaderFeatureGLSL.cpp 2015-01-20 19:13:25 +01:00
Anis c9116dd4a4 OpenGL fix - fixed a crash when you activate Alpha Threshold checkbox without a diffuse map 2015-01-20 19:07:29 +01:00
Anis f05b1b5cbd fix #1117 2015-01-20 17:02:56 +01:00
Anis 9d84372dc8 Intel OpenGL - fix a crash/shader compile error when you activate Vertex Lit from Material Editor 2015-01-19 20:56:02 +01:00
Anis 32b2564cd5 Jeff faust fix also on openGL. 2015-01-19 18:04:31 +01:00
Jeff Hutchinson f615802ba2 Fixed defines for shadergen. Defines were "defining" structure properties out for IN structures.
example:

         // struct VertexData
         // {
         //    vec3 position;
         //    vec3 normal;
         //    vec3 T;
         //    vec3 B;
         //    vec2 texCoord;
         //    vec2 texCoord2;
         // } IN;
         //
         // varying vec4 _TEXCOORD2_;
         //
         // #define texCoord2 OUT_texCoord2
         // #define OUT_outVpos _TEXCOORD2_
2015-01-11 01:30:58 -05:00
Azaezel b2a4f3fd44 depth correction
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
   // This fix prevents some bad rendering artifacts that occur at the edge of the visibleDistance.
   // The artifacts are most obvious when there is fog present.
2014-12-22 17:58:12 -06:00
Azaezel c6cdfafe4e cleaned up variant of https://github.com/GarageGames/Torque3D/pull/768 alterations: opengl support, in-shader bug-reporting, direction vector fit to material slider-bar. 2014-12-21 14:07:42 -06:00
Anis 5c72035e01 virtual processVert also on directx 2014-12-19 12:25:56 +01:00
Anis 30815cb641 fixed also on DirectX 2014-12-19 12:25:18 +01:00
Anis 4bf5aade6e make override processVert on SpecularMap feature 2014-12-19 12:24:03 +01:00
Anis 1751e60734 bugfix #1066
texcoord connector on the vertexshader to avoid link time error
2014-12-19 12:22:36 +01:00
LuisAntonRebollo 15c8922028 Fix ShaderGen cubemap feature. 2014-12-15 18:28:17 +01:00
LuisAntonRebollo ed0febea39 Clean GLSL fragment shader out. 2014-11-30 23:00:18 +01:00
LuisAntonRebollo 4409a12af6 Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
LuisAntonRebollo 98e3651db5 Merge pull request #940 from BeamNG/add_opengl_support
Add/Activate OpenGL render.
2014-11-30 02:48:13 +01:00
LuisAntonRebollo 82315a9960 Merge pull request #933 from BeamNG/shadergen_glsl
Changes on ShaderGen for generate GLSL shaders.
2014-11-30 02:22:58 +01:00
Anis 2582670925 Update shaderFeatureGLSL.cpp
fix compile shader
2014-11-27 20:31:58 +01:00
LuisAntonRebollo dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
LuisAntonRebollo 61d3e52ad1 Changes on ShaderGen for generate GLSL shaders. 2014-11-08 18:40:33 +01:00
LuisAntonRebollo 1ac8fab884 Changes for get necesary sampler names for OpenGL shaders. 2014-11-08 18:31:14 +01:00
Azaezel c3813ad913 implicit truncation warning cleanup. 2014-07-09 16:25:42 -05:00
rextimmy 3c56bf3a56 Fix to allow parallax mapping with dxtnm textures via the red channel. 2014-07-03 17:56:47 +10:00
LuisAntonRebollo 6450294855 Fixes for dedicated build on linux.
Thx @Bloodknigh for Signal fix.
2014-05-30 12:35:39 +02:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02:00
Thomas Fischer c850d60a4f Merge pull request #621 from BeamNG/glsl_shadergen
Update GLSL Shadergen.
2014-05-23 07:52:35 +02:00
bank e7fb6a54de Fix: Added missing virtual destructors for classes with virtual functions. 2014-05-06 12:40:46 +04:00
LuisAntonRebollo 9221b4dd10 Update GLSL Shadergen. Not used on DX9. 2014-04-17 18:39:13 +02:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
2014-04-04 13:43:25 +11:00
DavidWyand-GG 17113d3ba5 Blinn-Phong Specular Changes
Based on the work done here:
http://www.garagegames.com/community/blogs/view/21032
2013-10-29 15:10:23 -04:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
DavidWyand-GG eb2fd2bf5f Fix for Issue #94 for Cubemap render bug 2012-10-17 11:46:17 -04:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00