7071d286e8
Fix inverted check for 16-bit indices
9 years ago
4e5462bc19
Don't attempt to create a collision shape for an empty TriShape
9 years ago
ca0e1fe0e0
Set the osg::Material on the terrain root node
9 years ago
6000e48bba
Add terrain shaders and normal map support
...
Textures with _n filename suffix are automatically recognized as terrain normal maps.
9 years ago
5e12a1b4ef
Add enchanted item glow to the shader
9 years ago
268594dcf1
Recreate shader in NpcAnimation::setAlpha
9 years ago
a73512afb7
Add shader settings to settings.cfg
9 years ago
21c4dffed2
Add #include support in shaders
9 years ago
22cc5c0965
Cache the Program
9 years ago
456816f707
Use diffuse.a / vertex.a, use material emission
9 years ago
3e854a84a2
Slightly more efficient applying of light state
9 years ago
f93b7ec943
Fix light state issue
...
GLSL does not respect gl_Disable(GL_LIGHTX), so we have to set unused lights to zero.
Sadly, this change makes the applying of the modelView matrix less efficient. So far I couldn't find a better solution, osg's state tracker keeps getting in the way. :(
9 years ago
9376811213
Vertex lighting shader
9 years ago
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
9 years ago
e647ee5424
Support RGB and RGBA embedded textures in NIF files ( Fixes #2295 )
9 years ago
a9ac108382
Fully read NiPixelData
9 years ago
606758d72f
NifLoader: create the BumpTexture slot, but don't use it yet
9 years ago
4cd4131da9
NifLoader: assign a name to created textures
...
This name will tell the shader visitor how to handle that texture.
9 years ago
50e92c8136
NifLoader: move texture property handling to a separate function
9 years ago
acf44fd9e5
NifLoader: handleTextureControllers outside of the NumTextures loop
9 years ago
e05d975020
Change the way that texture filtering settings are applied at runtime
9 years ago
a94029267f
Fix an inverted condition (Bug #3209 )
9 years ago
c4d38bb42d
Fix clang analyzer warnings
9 years ago
ed57293e54
Allow '^' escape characters in books
...
http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7
9 years ago
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
9 years ago
83a9a164bc
Raise the required bullet version to 2.83
...
2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587 ).
9 years ago
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
9 years ago
eaf3f5a829
Remove unused arguments
9 years ago
6fc6913424
Do not set the cursor when creating it
9 years ago
5824619a95
Clean up includes
9 years ago
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
9 years ago
be6ea3d607
Account for UV coordinate flip in UVController ( Fixes #3203 )
9 years ago
da6dcfc49e
Merge remote-tracking branch 'scrawl/resource'
9 years ago
5e876b1379
Add missing include
9 years ago
98c5e072f2
Swap the terrain cache update order to make more sense
9 years ago
9f729667fb
Remove debug output
9 years ago
0865cea211
Preload terrain
9 years ago
98848c752a
Make getLayerInfo thread safe
9 years ago
8aba74e6ee
Remove GridElement
9 years ago
596fe56bfd
Make Land::loadData thread safe
9 years ago
afe533e670
Accept a const Object in UnrefQueue
9 years ago
246566cef4
Preload instances in BulletShapeManager
9 years ago
e28dc3e72f
Preload instances in SceneManager
9 years ago
2e62298bd3
Clean up ObjectCache includes
9 years ago
40a6e05e17
Use a deque instead of vector in UnrefQueue
9 years ago
d11c2864df
Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread
9 years ago
84f01b7527
Remove unneeded forward declaration
9 years ago
b2019d31c7
Mark thread safe methods in BsaFile
9 years ago
e4e313fe12
Remove outdated comment
9 years ago
c8054424c9
Preload items equipped by NPCs
9 years ago
a81b10b415
Make the cache expiryDelay configurable
9 years ago
41233fc8e5
Keep a reference to the original scene template for as long as the instance is used
9 years ago
778bce3ae9
Remove unused ObjectCache functions
9 years ago
49ecac4ced
Add a mutex lock around the SharedStateManager
9 years ago
c3ad4dad75
Fix applying of filter settings on terrain textures
9 years ago
8b981ab507
Crash fix
9 years ago
c155680d3c
Customize ObjectCache for more efficient locking in removeExpiredObjectsInCache
9 years ago
d855a13b44
Clear the resource cache from the worker thread
9 years ago
6f9ca0f68f
Add basic cell preloader class
...
Not properly in use yet, but seems to be working.
9 years ago
e055ae094a
Improve const-correctness in BulletShapeManager
...
Sadly, two const_cast's are needed to work around Bullet API quirks.
9 years ago
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.
9 years ago
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.
9 years ago
e02f35264f
Work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag ( Fixes #3183 )
9 years ago
ea1efaac0c
Use the osgDB::ObjectCache in SceneManager, cleanup
9 years ago
909c4d96b6
Use the osgDB::ObjectCache in BulletShapeManager
9 years ago
6c1c653cba
Use the osgDB::ObjectCache in ImageManager
...
Should be thread safe now.
9 years ago
9e5225bb6f
Do not unref a Texture's image data after applying it
9 years ago
9e53e12c70
More renaming of TextureManager -> ImageManager
9 years ago
5ee3d1698f
Remove getWarningTexture in favor of getWarningImage
9 years ago
f99f403dda
Rename TextureManager to ImageManager
9 years ago
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.
9 years ago
fbd4ad9b0c
Flip terrain textures
9 years ago
71401aafe7
Handle multipass techniques in SetFilterSettingsVisitor
9 years ago
31988ca4cc
Add a dont_override_filter description for textures that should be left alone
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
b06730ac61
Fix terrain textureCompileDummy
9 years ago
2eda495f89
Build fix for OSG 3.2
9 years ago
06ed20abf8
Use the initial pose of a MorphGeometry for object placement ( Fixes #3136 )
9 years ago
8360cccce7
Don't clone Drawable UpdateCallbacks twice
...
The Drawable copy constructor takes care of that already.
9 years ago
6b48acaf0e
Don't optimize TriShapes with controllers ( Fixes #3143 )
9 years ago
d9290b0ee0
Array fix
9 years ago
aec8c38461
Move observer_ptr include where it belongs
9 years ago
48f53e23bf
Allow alternate mesh formats for marker_error
9 years ago
0659687bfb
Some fixes for building on FreeBSD
9 years ago
f0971ee8ad
Implement Fixme script instruction
9 years ago
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
9 years ago
62fe47b144
Load default terrain if there is none defined
9 years ago
458a305bff
OpenCS: add lighting mask
9 years ago
e1c7165bfb
Fix bounds calculation for addLight to a transform node
9 years ago
93cc08a09c
Lighting fix for LightListCallbacks attached to a Transform node
9 years ago
3089aeccc4
Factor out SceneUtil::addLight
9 years ago
438b30d6f0
Move configureLight to a separate file
9 years ago
11496b8075
Read fallback settings in OpenCS
9 years ago
6546c05428
Move Fallback map to components/
9 years ago
ece40b1e96
improved the remaining handling of extra arguments
9 years ago
46e32de350
improved handling of extra arguments in DiscardParser
9 years ago
f9607a47b3
improved handling of extra arguments in StringParser
9 years ago
210c77968a
Don't report warning about extra arguments, if there are no extra arguments ( Fixes #3133 )
9 years ago
daa94cc50e
Fix cppcheck warnings
9 years ago
0597c8fd9c
Pass a Vec4f by reference
9 years ago
ea0be6e737
Update ScriptArgs documentation
9 years ago
23cd2056bf
Ignore extra arguments in playSound and playSound3D.
...
A common mistake in mods is to use playSound with volume/pitch arguments, which only playSoundVP supports. Previously these extra arguments raised a parser error, making the respective mod unusable.
9 years ago
e695619aa5
ExprParser: Warn about ignored arguments
9 years ago
3ebfb47983
Do not discard root node transformations if the root node is named 'bip01' (Bug #3118 )
9 years ago
0efb8e2949
osgDB::ObjectCache was added in 3.3.3, not 3.4.0
...
Fixes redefinition error on builds with OSG >3.3.3 <3.4.0
9 years ago
deb7f3caf6
Print deletion state in ObjectReferenceInfo
9 years ago
723c392a73
NifLoader: fall back to the first UV set when encountering invalid UV set references
9 years ago
0731595c2b
Wrap a Texture2D in a ref_ptr
9 years ago
31c3324705
Don't assume the emitter node is a Group ( Fixes #3082 )
...
This would be a correct assumption by default, but is no longer true when the NifLoader::optimize() function optimizes the graph.
9 years ago
d5a2586f38
LoadingScreen: add support for important labels
...
Used in saveGame so the player can be sure whether or not the game was saved.
Fixes #3074
9 years ago
625644e917
LoadingScreen: documentation updates
9 years ago
ccbba5e926
LoadingScreen: remove indicateProgress, not used
9 years ago
78a733a12c
Fix initialization of InputWrapper::mWindowHasFocus
9 years ago
c70790ecb7
Remove outdated comment
9 years ago
076dc539bc
KeyframeManager fix
9 years ago
f1faeeae3a
Use separate config options for min and mag texture filters
9 years ago
5c0a847eaf
Combine some duplicate code
9 years ago
64424e7262
Move keyframe loading out of SceneManager to new KeyframeManager
9 years ago
295563ba65
Minor fix
9 years ago
6f966b8434
Don't use osg::notify
9 years ago
06719df868
Use the standard cursor if the custom cursor can't be used
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
0efce6cd4c
Fix typo in a comment
9 years ago
eb92b853fe
BulletNifLoader: preallocate the btTriangleMesh's vertices/indices
9 years ago
293f3f30b5
Indentation fix
9 years ago
57b7cac13f
Merge pull request #850 from MatthewRock/fix-2952-2
...
Fix for bug #2952 : Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
9 years ago
3b254ad631
Allows the same item to have multiple ancestors
9 years ago
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
9 years ago
d00d487c3d
Improved error reporting under POSIX using errno and strerror().
9 years ago
de84452e5a
NifFile: close the stream after reading ( Fixes #3070 )
9 years ago
39feb547a0
Broken lower casing fix ( Fixes #3068 )
9 years ago
aa721fe1f6
Fix bug 2952 with merchant and levelled items
9 years ago
624809c8dc
Minor fix for error handling in skeleton.cpp
9 years ago
07b064f616
Rename to lowerCaseInPlace
9 years ago
e3d3380c8c
Remove return value for in-place toLowerStr
9 years ago
e4751c68e9
Typo fix
9 years ago
42d68eb7fb
Build fix
9 years ago
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
9 years ago
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
9 years ago
671561ea37
Write moved references to the save game file (not resolved on loading yet)
9 years ago
1d5af3c9c8
Remove unneeded cast
9 years ago
e39f49a88f
OSG extensions namespace fixes
9 years ago
c60f4ba7bd
Make RigGeometry bone references case-insensitive ( Fixes #3058 )
9 years ago
258f7a2b42
LightController fixes
9 years ago
4a9b37aa53
Fix copy constructor issue
9 years ago
c442af09c5
Write more documentation for the lighting system
9 years ago
462ef617ce
Don't read forward/backward values for Quaternion key lists
...
https://forum.openmw.org/viewtopic.php?f=8&t=3201&p=35867#p35867
9 years ago
8e9571d155
Double buffer the light StateAttributes and StateSets
...
Fixes a race condition where the position of a light could jump a frame ahead.
9 years ago
scrawl
Marc Zinnschlag
Tobias Kortkamp
Alexander "Ace" Olofsson
Chris Robinson
Paul Cercueil
MatthewRock
cfcohen