Commit Graph

125 Commits

Author SHA1 Message Date
a3ddd7b1b3 Fix for some problems when using shadows with the superfancywater.
This was SVN commit r12809.
2012-11-02 13:08:58 +00:00
f3984a6c0e Forgot the waves shader.
This was SVN commit r12803.
2012-10-31 18:54:10 +00:00
fb035d08e3 fixes #1572 and fixes #932
Changes the water rendering in game to support higher quality effects
and to look nicer.

This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
97b46d402c Removing GL3 dependency from GPU skinning code.
This was SVN commit r12801.
2012-10-30 21:57:00 +00:00
367c67d6ad GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup.
This was SVN commit r12795.
2012-10-29 13:20:21 +00:00
5d960a136a Bactrian archer cav.
Tweaked HQDOF settings.

This was SVN commit r12788.
2012-10-27 22:18:29 +00:00
gregory
cd79b8e57b Changed DOF size and position.
This was SVN commit r12787.
2012-10-27 21:26:33 +00:00
gregory
97554bd726 Made sampling code remove blurring from around fully-focused foreground objects and cleaned up some of the code a bit.
This was SVN commit r12785.
2012-10-26 05:25:50 +00:00
gregory
9698b67400 Made manual DOF scale with focus.
This was SVN commit r12774.
2012-10-20 23:39:56 +00:00
gregory
753d151959 Added comments listing the changes from the original shader by Martinsh.
This was SVN commit r12772.
2012-10-18 20:06:25 +00:00
gregory
e963b43dcc Made bokeh DOF blur stronger, made it use the postproc manager's zNear and zFar values, and moved its settings into its effect XML file.
This was SVN commit r12771.
2012-10-18 18:52:52 +00:00
gregory
2c292798bc Changed sample count on high-quality DOF to increase performance.
This was SVN commit r12764.
2012-10-18 01:31:13 +00:00
gregory
43ad3569e1 Added higher-quality DOF postproc filter.
This was SVN commit r12763.
2012-10-18 01:21:24 +00:00
1fb7889539 Postproc manager
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
9e328e6b9f Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory.
This was SVN commit r12727.
2012-10-03 12:40:01 +00:00
bf5b7938f4 First attempt at adding waterfall splashes...
This was SVN commit r12686.
2012-09-17 12:22:21 +00:00
37cdcdc6fa Removing use of textureGrad function in shaders, as it requires too new a version of OpenGL.
This was SVN commit r12656.
2012-09-09 14:53:34 +00:00
779a33ee30 Water and waterfall shaders, materials and examples.
This was SVN commit r12643.
2012-09-08 18:56:13 +00:00
2ed11f6a84 Trying to clean up the old specularity code
This was SVN commit r12568.
2012-08-31 19:12:42 +00:00
e8758b8bf1 Making sure LOS really is black after Reveal Map option is used...
This was SVN commit r12565.
2012-08-31 18:33:03 +00:00
ea11dee4fa Bugfix: made sure LOS is always thresholded to black
This was SVN commit r12561.
2012-08-30 20:29:39 +00:00
5fcbf01fcb Using even stricter GLSL typing to please even more compilers...
This was SVN commit r12557.
2012-08-30 14:13:28 +00:00
2850476389 Using stricter GLSL typing to please some compilers
This was SVN commit r12552.
2012-08-30 00:29:10 +00:00
38c1a4c4a1 Modified sky, minimap and healthbar renderers to use shaders, to fix a bug reported by historic_bruno
This was SVN commit r12551.
2012-08-29 23:07:53 +00:00
7ba2b8947c Attempting to fix a graphical bug affecting ARB mode
This was SVN commit r12507.
2012-08-21 18:04:05 +00:00
b1090d1a12 Use a linear interpolation to find the point where the parallax ray intersects the surface more accurately.
This was SVN commit r12394.
2012-08-12 14:50:56 +00:00
9c56092999 Added very high quality parallax; GPU-intensive, defaults to off; enabled through config
This was SVN commit r12361.
2012-08-11 15:25:00 +00:00
eee04db56b Bugfix- changed GLSL particle shader to use modelview matrix instead of modelviewprojection
This was SVN commit r12350.
2012-08-10 21:40:50 +00:00
d45379cc62 Bugfix- changed GLSL particle shader to look the same as ARB
This was SVN commit r12349.
2012-08-10 21:02:22 +00:00
eb422bc4b3 Bugfix- changed GLSL particle shader to look the same as ARB
This was SVN commit r12344.
2012-08-10 18:14:42 +00:00
a89d131f2d Added specular mapping for units
This was SVN commit r12336.
2012-08-09 18:49:35 +00:00
88ab3f0f5b Terrain/decal materials (includes triplanar/normal/specular/emissive mapping); custom alphamaps
This was SVN commit r12306.
2012-08-07 18:21:16 +00:00
648e68e49c smooth LOS
This was SVN commit r12304.
2012-08-06 22:38:42 +00:00
da8c673a0a ao/parallax/normal/specular/emissive mapping; windy trees; time manager; render queries; conditional defines
This was SVN commit r12300.
2012-08-06 19:10:47 +00:00
dd072112d1 Improved shadow filtering, from eihrul.
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
282d0f39e2 Remove unused variables
This was SVN commit r11804.
2012-05-09 15:39:16 +00:00
vts
34fc883317 Pretty unit selection overlay rings. Fixes #824.
This was SVN commit r11623.
2012-04-22 04:04:02 +00:00
a07dd82a70 Allow materials to disable receiving shadows
This was SVN commit r11500.
2012-04-14 17:32:22 +00:00
227f9e403f Experimental GPU skinning.
Share inverse bind pose matrices between models.

This was SVN commit r11490.
2012-04-12 15:43:59 +00:00
ce215cace3 Add support for custom vertex attributes and array-of-matrix uniforms in GLSL.
This was SVN commit r11489.
2012-04-12 14:10:02 +00:00
d3a24c26ba Do alpha-testing earlier in ARB shaders, for performance.
This was SVN commit r11477.
2012-04-10 21:08:54 +00:00
05008d190e Clean up terrain shader a bit
This was SVN commit r11473.
2012-04-10 20:55:01 +00:00
4b5bd36d9b Multiply specular lighting by sun color
This was SVN commit r11460.
2012-04-08 23:03:22 +00:00
f3617822e0 Make AlwaysVisible objects always visible in shader mode. Fixes #908.
This was SVN commit r11454.
2012-04-08 16:36:23 +00:00
b7888aea52 Add support for specular materials.
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.

This was SVN commit r11453.
2012-04-08 15:55:06 +00:00
e686c65fe6 Partial support for alpha-tested materials
This was SVN commit r11425.
2012-04-03 20:00:04 +00:00
59447bce2e Move shaders into appropriate subdirectories.
Delete some obsolete shader files.

This was SVN commit r11424.
2012-04-03 19:45:58 +00:00
6bc33fe8bd Update renderer design to be more flexible and data-driven based on material and shader definitions.
Support conditional expressions in shader effect XML files.
Consolidate fixed-function model rendering into the shader system.
Remove lots of now-obsolete renderer code.
Move shader defines from std::map to new class with interned data, for
performance.
Move texture from model into material.
Alleviate singletonitis.
Remove obsolete lodbias setting.
Remove unused terrain shadow transparency.

This was SVN commit r11423.
2012-04-03 18:44:46 +00:00
36107cb7e1 GLES compatibility for particles and shadows.
Fix invalid enum errors.
Fix shader texture binding.

This was SVN commit r11372.
2012-03-19 21:10:14 +00:00
811e8b7efd Fix GLSL terrain.
This was SVN commit r11157.
2012-02-25 17:47:41 +00:00
cb5669e3d7 Add terrain effect files.
This was SVN commit r11156.
2012-02-25 17:31:19 +00:00
5009636e39 Improve Android compatibility.
Basic touchscreen input for testing.
Better GLSL support for map rendering.

This was SVN commit r11155.
2012-02-25 17:29:27 +00:00
832a51da80 GLSL text support
This was SVN commit r11080.
2012-02-15 21:53:13 +00:00
18043d88a5 Fix solid shader for GLSL
This was SVN commit r11065.
2012-02-13 21:00:41 +00:00
9972eb8cae Enough GLES compatibility to reach the menu screen
This was SVN commit r11064.
2012-02-13 20:53:24 +00:00
677ccf53e6 Yet more GLES compatibility
This was SVN commit r11061.
2012-02-13 16:41:17 +00:00
4bf59b9a7d More GLES compatibility, mainly around terrain rendering.
This was SVN commit r11059.
2012-02-13 14:02:14 +00:00
db85833655 More GLES compatibility.
Move more rendering code to shader API.

This was SVN commit r11050.
2012-02-12 13:20:49 +00:00
a3f168b887 Initial support for GLSL generic vertex attributes in shader API, for GLES compatibility.
Specify GLSL version in shader files, for better error detection.

This was SVN commit r11040.
2012-02-09 17:55:25 +00:00
cc5a0fba4e Use shader API for GUI text.
Flip GUI quads so we don't have to disable back-face culling.

This was SVN commit r10989.
2012-01-30 00:27:23 +00:00
8324a8981d Simplify GLSL program files.
Move water shaders to new shader system.

This was SVN commit r10982.
2012-01-29 12:04:39 +00:00
adbd7633dd # Initial GLSL rendering support
This was SVN commit r10978.
2012-01-29 01:22:22 +00:00
7f679a7975 # Support separate rotation and scaling for each terrain texture
This was SVN commit r10952.
2012-01-22 18:20:33 +00:00
vts
db864f10c3 Rendering marker lines between buildings and rally points
Added command button to focus on rally point
(implements #524)

This was SVN commit r10704.
2011-12-10 07:07:04 +00:00
308cb26dd4 # Health decay for buildings not in a civ center's territory.
This was SVN commit r10034.
2011-08-18 20:28:53 +00:00
8fee3d8ef8 # New territory border rendering.
Add textured line overlay rendering.
Change terrain height calculations to be triangulation-dependent for
improved accuracy.
Add triangulation-dependent terrain normal function.
Support separate S/T wrap modes for textures.
Rename CVector2D_Maths since it no longer conflicts with simulation
CVector2D.
Coalesce freed chunks in vertex buffers, to avoid excessive
fragmentation.
Add some things to help debug vertex buffer allocation a little.

This was SVN commit r9929.
2011-07-30 00:56:45 +00:00
f9d7c1246d # Initial support for territories
This was SVN commit r9889.
2011-07-20 19:48:06 +00:00
b08e142193 Graphics optimisations and features from eihrul.
Add shadow filtering (PCF) option.
Fix ugly shadow saturation in old lighting mode.
Fix fancy water shader.
Fix camera matrix computation.
Support scissoring of camera frustum.
Optimise vertex skinning.
Inline various matrix functions.
Support filtering of the list of submitted models before a rendering
pass, for more precise culling.
Optimise water renderer (fixes #721, based on patch by ortalo).
Use scissoring when generating reflection/refraction textures.
Skip reflection/refraction texture generation when no water is visible.
Render alpha-blended objects differently (fixes #434).
Reduce shadow swimming effects.

This was SVN commit r9814.
2011-07-12 23:48:05 +00:00
8753f881ee Renderer simplification: Remove old vertexshader path.
This was SVN commit r9186.
2011-04-06 22:02:05 +00:00
823e63a93b # Initial version of new particle system.
This was SVN commit r9151.
2011-04-03 19:15:15 +00:00
97c934ad1c Apply unit shading colour in shader renderpath.
Don't adjust the shading colour of units in FoW (the shading comes from
the LOS texture instead).

This was SVN commit r9142.
2011-04-02 12:04:19 +00:00
d295dacb9b # Add new renderer mode based on GL_ARB_fragment_program.
Change lighting model for new maps to allow better overbrightness.
Cache player colours instead of loading from scripts every time the
renderer wants them.

This was SVN commit r9123.
2011-03-26 20:17:21 +00:00
d49994a0b4 Explicitly clamp gl_FrontColor, for llvmpipe compatibility
This was SVN commit r9075.
2011-03-18 16:55:51 +00:00
fe21c5e023 # Rewrite fog-of-war rendering.
Disable shadows when only 2 TMUs available.
Clean up some other rendering code.

This was SVN commit r8882.
2011-02-03 01:12:24 +00:00
34f1817869 Splitting Internal with Public
This was SVN commit r6391.
2008-09-18 04:38:42 +00:00