scrawl
a81b10b415
Make the cache expiryDelay configurable
2016-02-07 19:05:55 +01:00
scrawl
41233fc8e5
Keep a reference to the original scene template for as long as the instance is used
2016-02-07 18:56:21 +01:00
scrawl
778bce3ae9
Remove unused ObjectCache functions
2016-02-07 18:27:12 +01:00
scrawl
49ecac4ced
Add a mutex lock around the SharedStateManager
2016-02-07 07:37:35 -08:00
scrawl
c3ad4dad75
Fix applying of filter settings on terrain textures
2016-02-07 05:53:56 -08:00
scrawl
8b981ab507
Crash fix
2016-02-07 05:53:42 -08:00
scrawl
c155680d3c
Customize ObjectCache for more efficient locking in removeExpiredObjectsInCache
2016-02-07 00:43:37 +01:00
scrawl
d855a13b44
Clear the resource cache from the worker thread
2016-02-07 00:36:31 +01:00
scrawl
6f9ca0f68f
Add basic cell preloader class
...
Not properly in use yet, but seems to be working.
2016-02-07 00:14:13 +01:00
scrawl
e055ae094a
Improve const-correctness in BulletShapeManager
...
Sadly, two const_cast's are needed to work around Bullet API quirks.
2016-02-07 00:14:13 +01:00
scrawl
b7e69cbc64
Refactor WorkQueue, merge WorkTicket and WorkItem
...
Allow the caller to hold on to the WorkItem. This makes it possible for a derived WorkItem to store the result of the work within the WorkItem itself.
2016-02-06 22:42:45 +01:00
scrawl
df57d4bfba
Use a common base class for resource managers
...
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
2016-02-06 17:22:17 +01:00
scrawl
ea1efaac0c
Use the osgDB::ObjectCache in SceneManager, cleanup
2016-02-06 00:15:12 +01:00
scrawl
909c4d96b6
Use the osgDB::ObjectCache in BulletShapeManager
2016-02-05 23:59:37 +01:00
scrawl
6c1c653cba
Use the osgDB::ObjectCache in ImageManager
...
Should be thread safe now.
2016-02-05 23:31:59 +01:00
scrawl
9e5225bb6f
Do not unref a Texture's image data after applying it
2016-02-05 23:21:54 +01:00
scrawl
9e53e12c70
More renaming of TextureManager -> ImageManager
2016-02-05 23:10:27 +01:00
scrawl
5ee3d1698f
Remove getWarningTexture in favor of getWarningImage
2016-02-05 23:05:43 +01:00
scrawl
f99f403dda
Rename TextureManager to ImageManager
2016-02-05 23:03:53 +01:00
scrawl
6ef848b7c5
Remove TextureManager::getTexture2D
...
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.
This is closer to what the OSG serializer does.
Streamlines the TextureManager and will make it easier to multithread.
2016-02-05 23:01:11 +01:00
scrawl
fbd4ad9b0c
Flip terrain textures
2016-02-05 22:46:15 +01:00
scrawl
71401aafe7
Handle multipass techniques in SetFilterSettingsVisitor
2016-02-05 21:08:32 +01:00
scrawl
31988ca4cc
Add a dont_override_filter description for textures that should be left alone
2016-02-05 21:07:08 +01:00
scrawl
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
2016-02-05 21:03:11 +01:00
scrawl
6ac688c0e2
Change the way that texture filtering setting changes are applied at runtime to not require keeping a reference to textures
...
The references would be difficult to clean up because there may or may not be another reference to the texture in the osgDB::SharedStateManager.
2016-02-05 21:03:11 +01:00
scrawl
e2ee1d5689
Use separate textures for the MyGUI RenderManager
...
This means we can more reliably set the filter parameters.
I believe this commit creates a regression where non-DDS GUI textures would display upside down, which will be addressed by further refactoring in the next commits.
2016-02-05 21:03:10 +01:00
scrawl
5b972ee777
Move texture filtering settings to SceneManager
...
Practical benefits:
- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
2016-02-05 21:03:10 +01:00
scrawl
b06730ac61
Fix terrain textureCompileDummy
2016-02-05 21:02:16 +01:00
scrawl
2eda495f89
Build fix for OSG 3.2
2016-02-03 19:05:15 +01:00
scrawl
06ed20abf8
Use the initial pose of a MorphGeometry for object placement ( Fixes #3136 )
2016-02-03 18:53:38 +01:00
scrawl
8360cccce7
Don't clone Drawable UpdateCallbacks twice
...
The Drawable copy constructor takes care of that already.
2016-02-01 21:02:48 +01:00
scrawl
6b48acaf0e
Don't optimize TriShapes with controllers ( Fixes #3143 )
2016-02-01 21:01:17 +01:00
scrawl
d9290b0ee0
Array fix
2016-01-25 21:13:38 +01:00
scrawl
aec8c38461
Move observer_ptr include where it belongs
2016-01-25 21:03:33 +01:00
scrawl
48f53e23bf
Allow alternate mesh formats for marker_error
2016-01-25 17:15:54 +01:00
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
2016-01-25 14:13:16 +01:00
scrawl
f0971ee8ad
Implement Fixme script instruction
2016-01-20 04:07:07 +01:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
scrawl
62fe47b144
Load default terrain if there is none defined
2016-01-14 16:41:50 +01:00
scrawl
458a305bff
OpenCS: add lighting mask
2016-01-11 23:14:43 +01:00
scrawl
e1c7165bfb
Fix bounds calculation for addLight to a transform node
2016-01-11 23:14:43 +01:00
scrawl
93cc08a09c
Lighting fix for LightListCallbacks attached to a Transform node
2016-01-11 23:10:16 +01:00
scrawl
3089aeccc4
Factor out SceneUtil::addLight
2016-01-11 23:10:16 +01:00
scrawl
438b30d6f0
Move configureLight to a separate file
2016-01-11 23:10:16 +01:00
scrawl
11496b8075
Read fallback settings in OpenCS
2016-01-11 23:10:16 +01:00
scrawl
6546c05428
Move Fallback map to components/
2016-01-11 23:10:16 +01:00
Marc Zinnschlag
ece40b1e96
improved the remaining handling of extra arguments
2016-01-07 16:07:49 +01:00
Marc Zinnschlag
46e32de350
improved handling of extra arguments in DiscardParser
2016-01-07 16:01:01 +01:00
Marc Zinnschlag
f9607a47b3
improved handling of extra arguments in StringParser
2016-01-07 15:54:22 +01:00
Marc Zinnschlag
210c77968a
Don't report warning about extra arguments, if there are no extra arguments ( Fixes #3133 )
2016-01-07 15:38:23 +01:00
