scrawl
88c50c5171
Merge branch 'master' into water
2012-04-05 15:38:46 +02:00
Lukasz Gromanowski
cd2789b15a
Revert "Issue #225 : Correction to commit ae98904."
...
This reverts commit 0e5c90d3e7
2012-04-04 21:05:19 +02:00
scrawl
6442d49e16
render queue groups, sky fix
2012-04-04 18:53:40 +02:00
scrawl
8aea311797
added visibility flags for everything
2012-04-03 15:13:47 +02:00
Lukasz Gromanowski
0e5c90d3e7
Issue #225 : Correction to commit ae98904.
...
Changed pointer to LandData struct to simple member variable.
2012-04-02 23:50:53 +02:00
Lukasz Gromanowski
ae989040e5
Issue #225 : Fix for memleak when loading terrain.
2012-04-01 21:29:49 +02:00
Marc Zinnschlag
557e97bab4
fixed a terrain-related Redemption crash
2012-03-30 15:52:09 +02:00
Jacob Essex
ec21ff21cc
Removed memory leak, allocated more on the stack
2012-03-27 13:58:12 +01:00
Jacob Essex
b76b62e5e4
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
2012-03-27 09:20:22 +01:00
Jacob Essex
eca91d17bb
Indentation tweaks and code cleanup
2012-03-04 11:46:33 +00:00
Jacob Essex
941a22034f
Merge branch 'terrain_next' of git://github.com/scrawl/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-04 11:30:37 +00:00
Jacob Essex
bcd2371baa
Code cleanup: Removed unneeded Ogre namespace
2012-03-04 11:21:47 +00:00
scrawl
a8939bc318
disabled the composite map, improves loading time a lot
2012-03-04 00:08:56 +01:00
scrawl
b882c03adc
fixed terrain regions without vertexcolours, tweaked maxPixelError
2012-03-02 23:36:48 +01:00
Jacob Essex
07a2e5a5be
Removed dead code, fixed a error, added comments and tweaked some constants (after trying to find their min/max values)
2012-03-02 21:20:12 +00:00
Jacob Essex
0f705eaca5
Removed the option of not splitting terrain as it was slower and adding to code complexity. The only real reason for keeping it, which was that it made debugging some texture issues easier is now gone.
2012-03-02 21:03:53 +00:00
Jacob Essex
3ecc427b96
Implemented slightly better texture splatting
2012-03-02 20:27:20 +00:00
scrawl
461ec9f3d6
fix regarding last commit
2012-03-02 18:50:55 +01:00
scrawl
0d4e3b8e75
remove alpha channel from colour map
2012-03-02 18:33:05 +01:00
scrawl
2bea4c4724
fixed the global colour map, apparently Ogre::Terrain was corrupting it
...
somehow, now we are just bypassing Ogre::Terrain for the colour map and
passing it directly to the material, which makes more sense
performance-wise anyway
2012-03-02 15:29:12 +01:00
scrawl
04c141ddd5
Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-02 13:49:57 +01:00
Jacob Essex
8dd6e75ae1
Vertex colours now uses the Ogre::Terrain colour map
2012-03-02 11:56:51 +00:00
scrawl
562cc7aa30
fixed 2 assertions that caused crashes
2012-03-01 15:03:43 +01:00
scrawl
fddf7b4dd0
terrain material now supports point lights
2012-03-01 14:35:39 +01:00
Jacob Essex
611f336d07
Now doesn't attempt to use fake vertex colours with cells that don't have vertex colours
2012-02-29 23:38:21 +00:00
Jacob Essex
6924348696
Fixed some texture splatting issues with loading empty terrain cells
2012-02-29 23:33:54 +00:00
Jacob Essex
1d0ae9c8d1
Start of a basic implementation of fake vertex colours
2012-02-29 23:05:22 +00:00
scrawl
bac7f23604
Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-02-29 19:38:34 +01:00
scrawl
be5555956c
improved composite map, now adapts to the ambient/diffuse light
2012-02-28 22:04:44 +01:00
scrawl
f55905609f
fixed the terrain normals - they had to be adjusted because we use Morrowind's coordinate system
2012-02-28 17:18:07 +01:00
scrawl
5b5e8ba4fd
fix a typo that caused SPLIT_TERRAIN=true blendmap to be too detailed (causing insane loading times)
2012-02-28 16:20:57 +01:00
scrawl
dbd2d390fd
terrain material fixes:
...
- disable normal and parallax mapping
- disable specular mapping and specular
2012-02-27 21:12:16 +01:00
scrawl
f34b2c73c5
committing the terrain material generator from ogre 1.7.4, it seems to
...
be almost impossible to make a derived class of TerrainMaterialGeneratorA
because of the many classes it contains and the inter-relationships
between them; just adding the whole source makes it a lot easier to modify
if we decide to update this source from OGRE upstream at any point
(which seems unlikely), we can take the diff from this commit on
to see the changes we did to the material generator
2012-02-27 19:44:52 +01:00
Jacob Essex
286701e3a5
Removed the flawed shading, updated textures, removed the need for a unused base texture
2012-02-11 20:54:29 +00:00
Jacob Essex
9cc3af34e5
Removed composite maps, fixes to texture sizes and unloading
2012-02-07 12:41:08 +00:00
Jacob Essex
5e3e6f9165
Fixed some minor bugs, a cells terrain can now be rendered as 4 Ogre::Terrain objects, possibly giving a speed increase
2012-01-24 13:29:31 +00:00
Jacob Essex
cd0df082df
Textures are now blended between cells and the texture blending functions are now more abstract
2012-01-23 17:19:54 +00:00
Jacob Essex
637302fc87
Added blended textures to the terrain
2012-01-21 17:59:12 +00:00
Jacob Essex
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
2012-01-21 16:59:08 +00:00
