1
0
forked from 0ad/0ad
Commit Graph

532 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
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
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
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
7d8dc05c68 Fixes actor viewer bug where view was obstructed by map's water level. Fixes #1562.
Adds water plane option to actor viewer.

This was SVN commit r12715.
2012-09-28 18:20:36 +00:00
db4b08d1ad Slight changes to the cubemap stuff in the sky manager, to make it behave better after archivebuild.
This was SVN commit r12697.
2012-09-21 20:22:23 +00:00
11b1c59397 A minor change to water rendering on models.
This was SVN commit r12677.
2012-09-16 11:39:04 +00:00
779a33ee30 Water and waterfall shaders, materials and examples.
This was SVN commit r12643.
2012-09-08 18:56:13 +00:00
3efb235725 And re-enabling the stuff disabled for debugging 2
This was SVN commit r12632.
2012-09-04 17:30:01 +00:00
10101b138d And re-enabling the stuff disabled for debugging
This was SVN commit r12631.
2012-09-04 16:59:03 +00:00
8b10290f78 Disabling some LOD stuff to track down Deiz's bug (as a result, parallax also temporarily disabled)
This was SVN commit r12629.
2012-09-04 15:55:36 +00:00
1ba858bf6e More on that bug (warning: renderer temporarily slower)
This was SVN commit r12628.
2012-09-04 12:34:02 +00:00
f92cda7a91 Testing something different in the hope it helps with a bug reported on the forums
This was SVN commit r12627.
2012-09-04 11:09:36 +00:00
affe91b52c Fixed fixed renderpath: green water, broken minimap
This was SVN commit r12588.
2012-09-01 22:34:36 +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
89cf2b26e3 Second attempt to fix a graphical glitch in ARB mode
This was SVN commit r12526.
2012-08-25 21:41:31 +00:00
e50bf9e539 Sky toggling through config and with Alt+Z
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
ddbc9e7d86 Disables useless MSVC warning in MikktspaceWrap. Cleans up a few inconsistencies
This was SVN commit r12505.
2012-08-21 16:40:07 +00:00
952385b21d Ticket 1612: Fixed overlay z-fighting in GLSL mode
This was SVN commit r12504.
2012-08-21 16:28:06 +00:00
011ba8255e New sound system implementation by stwf, refs #1223, #961.
Enables audio on OS X, refs #685, #931.
Fixes music not playing after a game, refs #946.

This was SVN commit r12428.
2012-08-15 00:10:44 +00:00
97c97dc7e0 Bugfix- changed decal/terrain blending mode for the fixed renderpath
This was SVN commit r12334.
2012-08-09 16:22:49 +00:00
e046fc0a01 Bugfix- changed some decal materials and fixed decal blending mode
This was SVN commit r12325.
2012-08-08 19:08:56 +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
47c2907f10 added licensing headers to some of the new files
This was SVN commit r12301.
2012-08-06 21:34:41 +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
c1a3b8f171 Updates to myconid's most recent multiple UV set patch. Refs #1497
This was SVN commit r12185.
2012-07-24 02:57:25 +00:00
f598101c34 Add support for multiple UVs and data driven texture loading. From myconid's patches. Fixes #1493 and fixes #1497.
This was SVN commit r12183.
2012-07-23 22:49:46 +00:00
vts
821cfe8862 Removed reverse dependency on SOverlayTexturedLine from CTexturedLineRData; fixes dangling pointer dereference. Fixes #1495.
This was SVN commit r11979.
2012-06-17 03:40:35 +00:00
637c09b204 Add support for OpenBSD. Fixes #1463.
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.

This was SVN commit r11970.
2012-06-13 20:43:56 +00:00
vts
da719b883c Split out code specific to textured overlay lines construction from OverlayRenderer into its own files.
This was SVN commit r11933.
2012-06-02 21:19:20 +00:00
dd072112d1 Improved shadow filtering, from eihrul.
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
79c6a2cecc Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186.
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
e4528af72b Fix vector allocator types
This was SVN commit r11708.
2012-05-01 21:12:43 +00:00
0bd649294f Add support for texture-based terrain overlays.
Fix GLES compatibility.

This was SVN commit r11663.
2012-04-24 16:46:32 +00:00
vts
f72bfb1cf1 Add option to disable particles, based on patch by rogue-spectre. Fixes #1222.
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
vts
97f49954cd Allocate VBO buffers in OverlayRenderer only after graphics capabilities and shader path have been properly determined. Fixes #824.
This was SVN commit r11654.
2012-04-23 18:55:32 +00:00
vts
2590e62c38 Dropped some remnant debugging code
This was SVN commit r11644.
2012-04-22 22:45:28 +00:00
vts
3cbfd9260e Properly enforce the MAX_QUAD_OVERLAYS constraint
Some cleanup of graphics/Overlay.h

This was SVN commit r11629.
2012-04-22 13:19:35 +00:00
vts
34fc883317 Pretty unit selection overlay rings. Fixes #824.
This was SVN commit r11623.
2012-04-22 04:04:02 +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
e6a82fff48 Bind textures correctly to GLSL sampler uniforms.
This was SVN commit r11476.
2012-04-10 21:07:52 +00:00
f2260892bd Add config option to force alpha-tested materials.
This was SVN commit r11475.
2012-04-10 21:03:22 +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
vts
305723f9a7 Prevent AABB/frustum intersections from blowing up on empty input bounds. Fixes #1027.
This was SVN commit r11441.
2012-04-05 22:29:01 +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
1095782d1a Increase maximum VBO size, to support larger meshes
This was SVN commit r11387.
2012-03-21 18:45:10 +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
dc715fe57f Remove some unused includes
This was SVN commit r11250.
2012-03-05 16:15:07 +00:00
7fa6afac37 Corrects some Doxygen comments and adds a few others of interest.
This was SVN commit r11209.
2012-03-01 03:55:05 +00:00
7663e78861 Fix terrain overlay rendering
This was SVN commit r11163.
2012-02-25 22:11:34 +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
f4625e69af Partial Android compatibility.
Remove unnecessary VM allocation (which seemingly causes problems on
Android due to mmap during static initialization).
Allow building without NVTT.

This was SVN commit r11074.
2012-02-15 13:58:58 +00:00
d70a981377 Android fixes
This was SVN commit r11068.
2012-02-13 23:53:09 +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
a9eca31bad Even more GLES compatibility
This was SVN commit r11060.
2012-02-13 15:06:25 +00:00
4bf59b9a7d More GLES compatibility, mainly around terrain rendering.
This was SVN commit r11059.
2012-02-13 14:02:14 +00:00
531b40578a More GLES compatibility.
Add config option to disable hardware cursors on Windows.

This was SVN commit r11053.
2012-02-12 20:45:31 +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
1f5b8f1c9a Move GUI renderer towards using shader infrastructure.
Remove support for unused GUI sprite effects.
Use vertex arrays for bounding box rendering.

This was SVN commit r11039.
2012-02-08 20:43:38 +00:00
08bd07ddd6 Adds safe bool operator to ICmpPtr, replacing the null() method, based on patch by leper. Also changes bool operator in AtSmartPtr to safe bool. Fixes #1077.
Changes some CmpPtr variable names for consistency.

This was SVN commit r11036.
2012-02-08 02:46:15 +00:00
b9c406551b Cache shader effects. Fixes #1143.
This was SVN commit r11006.
2012-02-02 22:58:42 +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
8be430eb30 Remove obsolete ogl_shader
This was SVN commit r10984.
2012-01-29 12:23:16 +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
91652bdf6e Implemented nested territory boundaries. Fixes #918.
Fixed out of bounds memory access in Atlas due to always using global
terrain in TerrainOverlay
Fixed wrong player ID calculation in TerritoryOverlay

This was SVN commit r10929.
2012-01-18 21:22:58 +00:00
ce67dfd333 Rename CELL_SIZE to TERRAIN_TILE_SIZE, to free up the term "cell" for other concepts.
This was SVN commit r10902.
2012-01-12 12:51:10 +00:00
0ec4242962 Detect and fix printf signedness errors. Fixes #1086, #1087.
This was SVN commit r10846.
2012-01-01 16:43:10 +00:00
1e0074e9da Fix crash with missing shader support
This was SVN commit r10829.
2011-12-29 13:35:07 +00:00
c4bb67a1ca Fix #1064 (use ++it instead of it++ for consistency), based on patch by Echelon9
This was SVN commit r10822.
2011-12-29 01:17:03 +00:00
3537ae31d5 sync with work:
x86_x64: update MSR definitions to include model 2F (westmere ex);
update bus clock computation for sandy bridge; remove unused
cpu_Serialize; use namespace, add model names
mahaf: cope with stricter security for services/drivers
ApicId -> GetApicId, move to apic module
aken: add batch file to install driver (optional)

This was SVN commit r10815.
2011-12-27 14:12:31 +00:00
vts
46a09ced71 Fixed some compilation warnings
This was SVN commit r10710.
2011-12-11 02:11:05 +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
vts
85186c98b2 Better selection boxes. Closes #914, #295, #810.
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
39d100c732 Moves camera projection settings to default.cfg.
Changes field of view (FOV) to 45 degrees per discussion. Fixes #941.
Tweaks default camera zoom and rotation accordingly.

This was SVN commit r10548.
2011-11-17 23:34:01 +00:00
fbff0aa98d Fix printf argument types
This was SVN commit r10529.
2011-11-13 18:31:06 +00:00
3916c25b84 Optimise vertex skinning code with SSE, based on patch by gruby.
Fixes #905.

This was SVN commit r10499.
2011-11-09 23:11:28 +00:00
cfb79c3062 # Add GPU performance profiling support.
Add some profiler region attributes.
Render events in profile visualiser.
Change profiler from GPL to MIT.

This was SVN commit r10492.
2011-11-09 13:09:01 +00:00
09a02c96d5 Add initial code annotations for the new profiling tool
This was SVN commit r10466.
2011-11-04 01:35:50 +00:00
8af8326563 replace old pool_allocator/RawPoolAllocator with ProxyAllocator that draws upon the new-style Arena (more efficient, avoids slow VirtualAlloc)
This was SVN commit r10410.
2011-10-16 10:37:21 +00:00
8729d1115d Render territory borders in non-shader render path.
Add basic support for fixed-function implementations of shader API.

This was SVN commit r10106.
2011-08-27 14:31:24 +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
364f76c5ff Fix rare use of uninitialised values
This was SVN commit r9847.
2011-07-16 19:52:48 +00:00
8eb7af4ac9 Be a bit more robust to build environment changes.
Reduce some module dependencies.
Clean up some unused instantiations.

This was SVN commit r9827.
2011-07-15 13:22:48 +00:00
ca42649c5b Fix MSVC warning
This was SVN commit r9820.
2011-07-13 19:28:31 +00:00
7f74693052 Disable culling of transparent objects in shadows/reflections, to fix trees
This was SVN commit r9818.
2011-07-13 13:51:40 +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
db5e483266 Fix typo in comment
This was SVN commit r9635.
2011-06-19 14:18:07 +00:00
5c76bc12fa refactor status code definitions: allow modules to define an array of them (more convenient+efficient).
merge ERR::NO_SYS, NOT_IMPLEMENTED into NOT_SUPPORTED
renderer: remove unnecessary ogl_shader include

This was SVN commit r9447.
2011-05-05 13:03:34 +00:00
9733affb05 Fix non-PCH build
This was SVN commit r9419.
2011-05-04 01:17:09 +00:00