417c84870c
Actually remove trailing tabs from source/.
...
This was SVN commit r18991.
2016-11-23 14:09:58 +00:00
ead8436b3d
Improve water rendering, partly based on a patch by aeonios, including:
...
-increase the size of the refraction and reflection texture
-blur the refraction map depending on depth
Fixes #3781
This was SVN commit r18443.
2016-06-26 16:54:58 +00:00
543472b77b
Optimization of isBoxVisible + cleanup, fixes #3712
...
This was SVN commit r17561.
2015-12-28 16:27:31 +00:00
432df9b38e
Use two range based for loops to fix two TODOs.
...
This was SVN commit r17303.
2015-11-28 08:27:42 +00:00
e638af5422
Clean up some unused variables and assignments.
...
This was SVN commit r16684.
2015-05-26 15:40:07 +00:00
aab15123f1
I hate myself.
...
This was SVN commit r16389.
2015-02-28 14:11:21 +00:00
2d7d5b446d
Fix Atlas so that changing water type will actually change water type.
...
Fix the water shader so that object reflections are more visible. Looks
better.
This was SVN commit r16388.
2015-02-28 13:50:52 +00:00
143e199d45
Add a new function to update the water renderer textures when resizing the renderer window. Patch by pendingchaos.
...
This fixes #2692 though the same issue might appear in some other cases
(possibly Atlas) and those will have to be checked.
This was SVN commit r16315.
2015-02-10 19:41:29 +00:00
a8499e89eb
Pad vertex data to power-of-two sizes.
...
This reduces the total number of different vertex sizes in the system,
allowing more data to share a single CVertexBuffer, therefore reducing
the amount of wasted space in each CVertexBuffer and reducing VRAM
usage.
This was SVN commit r16230.
2015-01-25 15:38:51 +00:00
49e2ecea63
Automatically convert all CLogger format strings from wchar_t* to char*.
...
Done with:
ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs sed
-i 's/LOG\(MESSAGE\|MESSAGERENDER\|WARNING\|ERROR\)(L/LOG\1(/g'
This was SVN commit r16183.
2015-01-22 20:31:30 +00:00
199eb46d86
Fixes GLES build
...
This was SVN commit r15914.
2014-10-29 02:36:42 +00:00
ea2db5386b
Fixes water rendering and crashes on GPUs without FBO support, fixes #2667
...
This was SVN commit r15814.
2014-09-27 01:32:03 +00:00
fee304d789
Fixes crash from 41b98a6f12
where a VBChunk* was released but not set to NULL
...
This was SVN commit r15721.
2014-09-09 04:13:50 +00:00
41b98a6f12
Fixes incorrect reuse of a member variable in WaterManager, caused a crash when starting a new map in Atlas after loading a water map. Fixes #2784 .
...
Fixes likely mem leaks from not cleaning up vertex buffer allocations
This was SVN commit r15715.
2014-09-07 23:49:24 +00:00
403b3b68af
Fix some errors in WaterManager.
...
This was SVN commit r15620.
2014-08-06 15:24:38 +00:00
5ae040ea54
Fix non-PCH build.
...
This was SVN commit r15618.
2014-08-06 13:23:02 +00:00
4028cd425e
Actually fix bugs on ATI cards. Switch reflection and refractions to use POT textures in an attempt to improve compatibility.
...
This was SVN commit r15598.
2014-08-02 12:54:45 +00:00
e50147fd96
Metaprogramming 9ce51f4357
.
...
Change something on water shaders to see if it works better on ATI
cards.
This was SVN commit r15594.
2014-08-01 10:15:29 +00:00
9ce51f4357
Commit coastal waves when activating fancy effects, and incidentally completely change how this effect work. Refs #48 .
...
This was SVN commit r15576.
2014-07-28 10:14:00 +00:00
5571f7a7f9
Fix "Wind Angle" parameter not working properly. Add a precomputed "wind strength" variable so that waves look smaller behind islands. Some tweaks. Refs #48 as usual.
...
This was SVN commit r15492.
2014-07-05 10:20:30 +00:00
9d4665248b
Check water FBOs creation correctly to detect some errors. Use two depth textures since I have a hunch the issues people encounter are caused by my using only one.
...
This was SVN commit r15488.
2014-07-04 10:14:35 +00:00
991d5bbd63
Fix random maps for my water changes. Fix the replay mode after I had broken it. Fix an occasional crash (that might have crashed Atlas, need someone to check).
...
Improve debugging slightly in case of framebuffer errors. Fix a few
style issues.
This was SVN commit r15486.
2014-07-04 09:03:21 +00:00
326290463e
Further WIP water improvements. Add 3 different textures for different looks. Update some oasis maps for that. Streamline water settings (some removed, some added). Update Atlas for those (needs to be tested). Fix an issue with HQ water effects.
...
Please report any issue and/or crash. Those will get fixed in commits to
come. Refs #48 .
This was SVN commit r15484.
2014-07-03 20:07:15 +00:00
ab30e0d4fb
Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet.
...
Change the shader itself so that the effects look nicer and are more
consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.
May work oddly with Atlas since I haven't been able to compile yet.
Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114
(assumption again), refs #48 .
This was SVN commit r15473.
2014-07-01 16:05:05 +00:00
3f78042f45
Fix tests and C++11 build.
...
This was SVN commit r14788.
2014-02-26 19:08:03 +00:00
e2f4379e9a
Fix an issue with corruption of water data when the actor editor opened in Atlas.
...
Potential marginal optimizations to the water data creation code.
This was SVN commit r14784.
2014-02-25 06:27:15 +00:00
2d806f81f0
If at first you don't succeed…
...
Refs #2359
This was SVN commit r14549.
2014-01-08 18:18:52 +00:00
0482038af2
Another go at #2359
...
This was SVN commit r14539.
2014-01-08 00:06:26 +00:00
d0e57cb0ff
Change a few things to avoid warnings with gcc. Should fix #2359
...
This was SVN commit r14529.
2014-01-06 22:14:27 +00:00
15ec863aec
Substantial speed-up of the foam generation code.
...
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.
Fixes #1743 , #1803 (invalid)
Refs #1875 , #2114 , #48 .
This was SVN commit r14514.
2014-01-05 16:15:20 +00:00
f1613a3c90
Fixes fancy waves build on GLES (replaces GL_QUADS with GL_TRIANGLES)
...
This was SVN commit r14151.
2013-11-12 01:25:32 +00:00
957c51727b
Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing.
...
This was SVN commit r13750.
2013-08-24 14:12:39 +00:00
ee877a46c7
Switch X and Z loops in the foam generation, possible speed improvement.
...
This was SVN commit r13720.
2013-08-20 08:55:33 +00:00
1739a381c1
Fix crash when editing terrain near map edges.
...
The values in CMessageTerrainChanged can be overestimates that exceed
the normal map boundaries, and should be clamped before looping over
them.
This was SVN commit r13714.
2013-08-19 19:19:34 +00:00
a4707bcc16
Change the water manager so incremental updates to the water information is possible. Streamline a few things (and removes a not-really-used calculation to speed things up further). Fixes #2063 , refs #1743 .
...
This was SVN commit r13698.
2013-08-18 09:27:11 +00:00
047992e61a
Fixes possible memory leaks by only allocating wave vertex buffers once and only when needed, and releasing them before re-allocating (in case CreateSuperfancyInfo is called multiple times).
...
Checks if wave vertex buffers were allocated before rendering, fixes
#2017
This was SVN commit r13561.
2013-07-15 03:26:48 +00:00
595c964d77
Make water specular more visible and fixes a few cases where it would actually hardly appear when it should.
...
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532 ).
This was SVN commit r13556.
2013-07-14 12:17:07 +00:00
408c30e061
Probably fixes #2021 . Optimization for foam generation while I'm at it (it's faster now, but there's a new temporary array of the size of the map)
...
This was SVN commit r13555.
2013-07-14 08:06:07 +00:00
136f1891c1
Fixes a fix about a fix on the waterManager. Fixes #1891
...
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
d9540ad7f6
Fixes MSVC build error and warning
...
This was SVN commit r13375.
2013-04-27 22:43:22 +00:00
4233acfa36
Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
...
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
a317cd9cba
Fixes memory leak and removes unused code in WaterManager, fixes #1891 , refs #1852
...
This was SVN commit r13337.
2013-04-03 03:30:10 +00:00
5c94761c3e
Fixes use of NULL for non-pointer type, fixes #1765
...
This was SVN commit r12997.
2012-12-18 22:52:55 +00:00
a4a060cd86
Fixes build warning and cleans up a few things
...
This was SVN commit r12895.
2012-11-26 02:28:35 +00:00
76676b1e38
Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ.
...
This was SVN commit r12822.
2012-11-05 12:14:04 +00:00
ed7c66eb82
Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas.
...
This was SVN commit r12817.
2012-11-04 15:54:36 +00:00
a3ddd7b1b3
Fix for some problems when using shadows with the superfancywater.
...
This was SVN commit r12809.
2012-11-02 13:08:58 +00:00
cf23990192
Updates random maps with new settings for the new water shader. Type ambiguity tweaks in WaterManager.
...
This was SVN commit r12806.
2012-11-01 10:17:54 +00:00
79f2fc1ac1
Fixes build error on MSVC, use of sqrt was ambiguous. Refs #1572
...
This was SVN commit r12804.
2012-10-31 20:59:43 +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