scrawl
d1e86d22ca
Check which local map textures actually need to be updated
...
On a typical exterior cell transition, we'll save 3 of 9 map renders. When moving back and forth between 2 cells, we can even reuse 6 of 9.
2017-02-08 22:20:57 +01:00
scrawl
8bfcf259a3
LocalMap no longer depends on osgViewer
2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb
Remove unneeded setGraphicsContext() calls
2016-08-16 19:33:09 +02:00
scrawl
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
2016-08-15 18:12:46 +02:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
044e0a829a
Add fog
2016-02-18 19:37:57 +01:00
scrawl
7d647088ab
Make the local map cell distance configurable
2016-02-05 01:19:45 +01:00
scrawl
bd655c20fd
Refactor local map updates
...
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.
Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
2016-02-05 01:19:45 +01:00
scrawl
ca4e859f61
Remove unused argument
2016-01-11 22:58:01 +01:00
scrawl
4690fd3f22
Change the local map exploration radius to better match the original engine
2016-01-11 22:57:57 +01:00
Paul Cercueil
0765ff3ba2
mwrender: Add missing includes
...
Those missing includes were causing the build to fail when compiled with
USE_GLES set.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 16:01:21 +01:00
scrawl
8e3bc981a2
Fix self-referencing camera
2015-11-10 21:45:53 +01:00
scrawl
6ba9f561ea
Use simple water for the local map
2015-10-29 00:25:24 +01:00
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
2015-09-24 15:21:42 +02:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
scrawl
278076e609
Include cleanup
2015-07-25 04:14:22 +02:00
scrawl
ce0d93caed
Fix for "GlobalMap trying to erase an inactive camera" spam in main menu
2015-06-04 16:32:21 +02:00
scrawl
24551c7bab
Fix for savegame incompatibility with master branch
2015-06-03 14:56:57 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
scrawl
01944c33f5
Basic water rendering
2015-06-02 16:35:35 +02:00
scrawl
6d3528af70
Port global map exploration
2015-05-29 01:49:52 +02:00
scrawl
5f7a82e0da
Fog of war fix
2015-05-28 16:20:29 +02:00
scrawl
c811ac6afe
Port fog of war
...
Not optimized yet, need to work on fog texture's DataVariance.
2015-05-28 03:50:49 +02:00
scrawl
c4951d1e73
Map rotation fix
2015-05-26 18:10:31 +02:00
scrawl
3dcb167066
Map rendering
2015-05-26 16:40:44 +02:00
scrawl
152d690a7a
Minor cleanup
2015-05-23 23:10:53 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
scrawl
08d8dd287c
I think this was committed by accident
2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d
Change dynamic_cast to static_cast to make coverity happy
2015-01-12 23:29:58 +01:00
scrawl
a47de06492
Make local map resolution configurable and use lower default value
...
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
2014-12-24 15:45:14 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
4f92044d71
Allow user-created markers on local map ( Fixes #1571 )
2014-08-26 17:45:23 +02:00
scrawl
c065a4b203
Add ManualResourceLoader for global map overlay ( Fixes #1736 )
2014-08-14 19:01:03 +02:00
scrawl
cd8287da16
Make sure fog texture is loaded before trying to convertToImage
2014-08-01 18:42:51 +02:00
scrawl
89af49f669
Make sure fog of war texture is loaded before accessing its buffer
2014-07-31 01:58:33 +02:00
scrawl
4ec51b386a
Add ManualResourceLoader for fog of war textures ( Fixes #1675 )
2014-07-24 19:00:57 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
scrawl
1d8da95756
Warning fix
2014-05-24 14:47:51 +02:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
scrawl
2bc2684a66
Fixes #275 : force updating exterior cell maps even if already in cache
2014-05-11 18:01:47 +02:00
scrawl
ac8abd3398
assert -> exception to gracefully handle corrupted savegames
2014-05-11 18:01:47 +02:00
scrawl
c39a0368cf
Bug #618 : Make local map textures static in an attempt to fix the disappearing maps with D3D.
...
Also removed problematic DISCARDABLE flag for fog of war textures.
2014-05-11 02:40:15 +02:00
scrawl
c98bea2a88
Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip
2014-05-11 02:27:43 +02:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
megaton
50af9bc0d3
General perfomance optimizations.
2014-03-30 19:45:27 +04:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
Marc Zinnschlag
367919200f
moved CellRefList into a separate file
2014-02-23 20:11:05 +01:00
Marc Zinnschlag
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
2014-02-21 11:35:46 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
5729672262
Show marked position on map. Implement Detect X magic effects.
2014-01-01 22:37:52 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
scrawl
3ddeb075fb
Fix a cell border seam on the map
2013-08-31 04:36:23 +02:00
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
2013-08-19 20:34:20 +02:00
scrawl
4983d08fe4
Fix a problem with statics disappearing sometimes on the map
...
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
2013-05-18 22:55:30 +02:00
scrawl
bcdab2aeab
Fix wrong padding breaking local map for cells where the bounds center is far from the origin
2013-03-11 19:32:39 +01:00
scrawl
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
2013-03-03 11:02:38 +01:00
scrawl
1d988676fe
Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this.
2013-02-28 22:56:29 +01:00
scrawl
3efbb5e728
Don't try to render a map in empty cells
2013-02-28 20:27:35 +01:00
scrawl
9b0ac4e299
NPCs / creatures can now emit ripples
2013-02-27 09:20:42 +01:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
341f9b96e2
Local map: restore zHigh
2013-02-26 13:53:23 +01:00
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
2013-02-26 13:39:10 +01:00
scrawl
42883ec64b
cleanup
2013-02-18 02:33:53 +01:00
scrawl
a29919d02d
restored global map
2013-02-05 00:39:56 +01:00
scrawl
fa07288b15
tweaked map light color
2013-02-03 20:29:50 +01:00
scrawl
5cc8af0f14
fix map positions
2013-02-03 20:06:03 +01:00
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
2013-02-03 15:46:23 +01:00
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
2013-01-12 08:23:15 +01:00
greye
d205723a17
resolving m prefix/ESMStore movement
2012-11-05 18:02:47 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
5834b4baa5
door markers on the local map
2012-08-28 17:30:34 +02:00
greye
fe1a9ac3c5
poor camera with some fixes
2012-08-17 15:19:43 +04:00
Marc Zinnschlag
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
2012-08-12 18:11:09 +02:00
Marc Zinnschlag
484cce12a8
Issue #107 : removed redundant getStore function from window manager
2012-08-12 14:36:46 +02:00
scrawl
07fd9986ef
accidently removed the map.
2012-07-09 20:14:07 +02:00
scrawl
b803d0e949
converted shadow caster shader
2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a
temp commit
2012-07-09 19:20:41 +02:00
scrawl
33c48b9481
update
2012-07-06 04:28:08 +02:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
scrawl
3daf1ebc3f
small map tweak
2012-05-28 05:03:50 +02:00
scrawl
a7e6a142f9
blend fog of war into adjacent cells
2012-05-27 00:39:33 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
scrawl
b3a186e729
simple water without shaders that uses original MW textures
2012-04-03 16:37:54 +02:00
scrawl
c1693a0c63
Merge branch 'minimap' into water
2012-04-03 15:37:11 +02:00
scrawl
51e33cc090
fixed map of some interiors
2012-04-03 15:34:13 +02:00
scrawl
8aea311797
added visibility flags for everything
2012-04-03 15:13:47 +02:00
scrawl
342464530d
rotated map working
2012-04-02 19:37:24 +02:00
scrawl
fc5cd703bb
maps are now rendered with correct rotation, however for interiors the arrow is wrong
2012-03-30 16:34:36 +02:00
scrawl
8d224f009f
toggleFogOfWar script command
2012-03-29 19:45:19 +02:00
scrawl
0c2317ce9d
player arrow works again
2012-03-29 19:20:09 +02:00
scrawl
01ecf3e0be
attempt at rotation (BROKEN)
2012-03-29 18:16:11 +02:00
scrawl
35f40b99ad
remove the bounding box hack, not needed because calculation is correct now
2012-03-29 18:10:01 +02:00
scrawl
bf421d2873
use vector instead of array
2012-03-27 00:18:09 +02:00
scrawl
28dfba55e0
delete fix
2012-03-26 20:29:07 +02:00
