Commit graph

81 commits

Author SHA1 Message Date
LuisAntonRebollo
475f218bcd Modified files for SDL2. 2015-01-18 22:52:29 +01:00
Luis Anton Rebollo
39bd99a61a Merge pull request #1056 from Lopuska/patch-12
mipmap support on OpenGL cubemap
2014-12-27 03:18:16 +01:00
LuisAntonRebollo
6789270789 OpenGL: Mipmaps for GFXGLCubemap. Fix dynamic cubemaps. 2014-12-27 03:03:33 +01:00
Luis Anton Rebollo
9eb05b2bdc Merge pull request #1083 from BeamNG/opengl_intel_WIP
Fix/walkaround for OpenGL on Intel
2014-12-27 01:13:14 +01:00
LuisAntonRebollo
c2c9cf4a2d OpenGL: Mipmaps for GFXGLCubemap. Fix compressed textures. 2014-12-27 00:01:21 +01:00
LuisAntonRebollo
2f8f89d486 OpenGL: Mipmaps for GFXGLCubemap. Fix mipmaps size. 2014-12-26 21:28:31 +01:00
LuisAntonRebollo
9150c7f5ab OpenGL: Mipmaps for GFXGLCubemap. 2014-12-26 21:03:54 +01:00
Daniel Buckmaster
ae284a89ec Merge branch 'development' into defineconsolemethod
Conflicts:
	Engine/source/materials/materialDefinition.cpp
2014-12-26 13:22:16 +11:00
Daniel Buckmaster
3ab048c5b0 Fixes after feedback from Luis.
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
2014-12-23 18:48:02 +11:00
Daniel Buckmaster
9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
Conflicts:
	Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23:55 +11:00
Anis
ca04726ad6 glGenerateMipmap on uncompressed cubemap 2014-12-16 15:14:30 +01:00
Anis
0cf36a8906 mipmap support on DDS for openGL cubemap 2014-12-15 18:59:42 +01:00
LuisAntonRebollo
d000a1e7c5 OpenGL Intel - Workaround for warning spam or even crash with actual framebuffer code, remove when implemented TGL layer. 2014-12-11 01:20:39 +01:00
LuisAntonRebollo
d49018df63 Fix GLCircularVolatileBuffer incorrect binding. 2014-12-05 22:56:22 +01:00
LuisAntonRebollo
4409a12af6 Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
LuisAntonRebollo
a4bf61f07b Fix x64 builds. 2014-11-30 04:00:58 +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
3067c3f0b2 Merge pull request #924 from BeamNG/remove_disableshader
Remove GFXDevice::disableShader
2014-11-30 02:47:46 +01:00
LuisAntonRebollo
0747a0efe9 Remove GFXDevice::disableShader becouse we are going to remove Fixed Function Pipeline and we need a shader for render. 2014-11-30 02:36:21 +01:00
LuisAntonRebollo
50fab23cb0 Merge pull request #938 from BeamNG/remove_old_opengl
Remove old/unused OpenGL files.
2014-11-30 02:23:29 +01:00
LuisAntonRebollo
9c66aa0681 Merge pull request #931 from BeamNG/terrain_layer_format
Set correct terrain layer texture format.
2014-11-30 02:22:39 +01:00
LuisAntonRebollo
07b0ea9ca6 Merge pull request #927 from BeamNG/setupgenericshader
Add GFXDevice::setupGenericShader for fix render on non FFP.
2014-11-30 02:22:13 +01:00
LuisAntonRebollo
60f4d4f282 Merge pull request #926 from BeamNG/primbuild_for_non_ffp
Fix PrimBuild with non Fixed Function Pipeline.
2014-11-30 02:21:36 +01:00
LuisAntonRebollo
03ffa1ddd3 Merge pull request #925 from BeamNG/shaderdata_samplernames
Add sampler names to ShaderData
2014-11-30 02:21:30 +01:00
LuisAntonRebollo
3e7c7b3e49 Merge pull request #622 from BeamNG/texel_pixel_offset
Handle texel-pixel offset with diferents graphics APIs.
2014-11-30 02:20:45 +01:00
LuisAntonRebollo
1c95ce21d6 Merge pull request #608 from BeamNG/use_gfxdevice_setupgenericshaders
Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
2014-11-30 02:20:00 +01:00
LuisAntonRebollo
823b413c1f Handle texel-pixel offset with diferents graphics APIs. 2014-11-27 00:59:17 +01:00
LuisAntonRebollo
a7434635cb Fix TAB vs Spaces on Engine/source/gfx/primBuilder.cpp 2014-11-25 22:43:22 +01:00
LuisAntonRebollo
dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
LuisAntonRebollo
417a7ec4c4 Remove old/unused OpenGL files. 2014-11-08 19:03:17 +01:00
LuisAntonRebollo
b81ebaa386 Set correct terrain layer texture format. 2014-11-08 18:19:14 +01:00
LuisAntonRebollo
cc16277ce6 Add GFXDevice::setupGenericShader for fix render on non FFP. 2014-11-08 17:59:36 +01:00
LuisAntonRebollo
fa1b2d87b1 Fix PrimBuild with non Fixed Function Pipeline. 2014-11-08 17:55:37 +01:00
LuisAntonRebollo
79e158d528 Add sampler names to ShaderData for use on old versions of OpenGL and Opengl ES2 that not support explicit sampler location on shader files. 2014-11-08 17:50:37 +01:00
Daniel Buckmaster
97ae3445c9 Merge pull request #793 from lukaspj/Terrain-Basetex-Formats
Terrain basetex formats
2014-11-04 14:54:08 +11:00
Vincent Gee
acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster
ef9bc91bff Merge pull request #744 from lukaspj/Ribbon-Implementation
Ribbon and RibbonNode
2014-10-28 15:19:17 +11:00
Daniel Buckmaster
561e26ea07 Merge pull request #721 from Azaezel/CubemapCleanup
deprecated functionality. T3D handles this in the reflector class.
2014-10-14 21:19:57 +11:00
Areloch
4716f76d5e Merge pull request #737 from Azaezel/queryStallPrevention
Query Stall Prevention
2014-10-01 23:48:53 -05:00
Azaezel
d5c42d0d44 Yikes. fatalityfix: need to create a platformtimer for the reference. 2014-10-01 23:35:06 -05:00
Lukas Joergensen
f2a3a1e2a6 Enable RGB format for DDS files getting copied to bitmap. 2014-09-23 13:47:14 +02:00
Daniel Buckmaster
225ef8a9ff Removed unused GFX interactive tests. 2014-09-01 08:39:59 +10:00
Lukas Joergensen
2c5f643dbe Added PCNTT vertex type.
This is a prerequisite change for the Ribbon implementation.
2014-07-31 00:22:45 +02:00
Azaezel
4f3be25699 prevents an infinite while loop by putting a cap of 4MS on occlusion queries. 2014-07-18 00:40:11 -05:00
Daniel Buckmaster
9a05899d8e Allow drawing 2D squares with 0 rotation angle. 2014-07-10 11:30:56 +02:00
Azaezel
901ceb943d deprecated functionality. T3D handles this in the reflector class. 2014-07-09 15:46:15 -05: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
4d7ffad284 Merge pull request #619 from BeamNG/gfxshader_init_ordered_samplers
Add GFXShader::init with support for ordered vector of sampler names for shader.
2014-05-23 07:54:24 +02:00
Daniel Buckmaster
1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency
Platform type consistency
2014-05-10 11:40:40 +10:00
Daniel Buckmaster
a42c92391a Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None
Rename enum GFXTextureProfile::None for avoid conficts on Linux.
2014-05-10 11:01:18 +10:00