scrawl
341e3846c0
Use initial particle state to compute the initial bounding box ( Fixes #3500 )
8 years ago
scrawl
dda5bfbc9f
CharacterPreview no longer depends on osgViewer
8 years ago
David Cernat
3c6710a7b5
Merge pull request #35 from OpenMW/master
...
Add OpenMW commits from 2nd week of August
9 years ago
David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
9 years ago
scrawl
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
9 years ago
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
9 years ago
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
9 years ago
Koncord
32a2327f59
fix header size
9 years ago
scrawl
513e1da8a3
Remove unneeded casts
9 years ago
scrawl
33d27a2285
Use ref_ptr
9 years ago
scrawl
2f6075329b
Clang warning fixes
9 years ago
David Cernat
babba95413
Merge pull request #34 from OpenMW/master
...
Add OpenMW commits from 1st week of August
9 years ago
scrawl
46538b9438
Merge pull request #1011 from devnexen/master
...
Mainly making compilable under OpenBSD.
9 years ago
Marc Zinnschlag
aa1ed9b172
Merge remote-tracking branch 'aesylwinn/RenderWater'
9 years ago
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
9 years ago
Koncord
1022b6b27c
Fix a header size
9 years ago
Aesylwinn
5753f52b47
Move water mesh + simple state generation to components library.
9 years ago
Koncord
7898b1181d
Reduced package size
9 years ago
David Cernat
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
9 years ago
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
9 years ago
Koncord
ed3dc8ca7b
Reduced server dependings
9 years ago
Koncord
7107136808
New API
...
SetExterior(pid, x, y)
GetExteriorX(pid)
GetExteriorY(pid)
also "SetCell" will now move to the named external cells (e.g. SetCell(pid, "Balmora"))
9 years ago
Marc Zinnschlag
63fd1e8df7
Merge remote-tracking branch 'origin/master'
9 years ago
AnyOldName3
a0699ce20d
Change some <> characters to double quotes, resolving compilation problems.
9 years ago
AnyOldName3
20f73f4a32
Relocate escape-related code to new files escape.hpp and escape.cpp.
9 years ago
Koncord
1e3eff91ac
Merged branch tes3mp-gui into tes3mp-gui
9 years ago
Koncord
9ab77cb123
New API functions: MessageBox, CustomMessageBox, InputDialog
...
New Callback: OnGUIAction
9 years ago
Stanislav Zhukov
917fa63f5c
Fixed security issue
9 years ago
MiroslavR
d790747389
Implement deletion of moved references (Bug #3471 )
9 years ago
AnyOldName3
7243583963
Change a switch to a series of if/else if/.../else, hopefully resolving compilation issues on OSX and Linux.
9 years ago
AnyOldName3
2b829f7f7b
Move some stuff to a header, removing the need for a dodgy hack.
9 years ago
AnyOldName3
becc053555
Trick the software into building by using what I assume is a really dirty hack.
9 years ago
AnyOldName3
519fbab864
Remove useless print
9 years ago
AnyOldName3
32f0ded8f6
Fix bug in unescape filter, but still manage not to fix build issue.
9 years ago
AnyOldName3
423919abb5
Make it not build again (but theoretically enable the desired functionality).
9 years ago
AnyOldName3
59639e3988
Make it build again (but remove the new functionality).
9 years ago
AnyOldName3
d9d5a6561b
Adjust the code so that it should (maybe) work, changing the compilation error to a less straighforward one.
9 years ago
AnyOldName3
95d2c7ea5c
Attempt to unescape characters when constructing file paths, introducing compilation errors.
9 years ago
David Cernat
360eec30a0
Merge pull request #2 from OpenMW/master
...
Add recent OpenMW commits by AnyOldName3
9 years ago
Marc Zinnschlag
c17e1ca24a
Merge remote-tracking branch 'anyoldname3/ignore-hash-test'
9 years ago
Aesylwinn
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
9 years ago
davidcernat
7bf08e5e5a
Fix transition between exterior cells for non-local players
...
Make the local player send a packet whenever moving from one exterior cell to another, don't require objects to have RefNums to be moved correctly between exterior cells, and increase the packet priority for cell changes.
9 years ago
MiroslavR
721fa28c1e
Fix assertion failure with NiTextureEffect missing source texture
9 years ago
davidcernat
b7e377c636
Remove _boundingBoxComputed from sceneutil's riggeometry.cpp
...
Recent versions of OpenSceneGraph have no _boundingBoxComputed, which is why building TES3MP with them causes an error. As expected, recent versions of OpenMW do not use _boundingBoxComputed either.
9 years ago
AnyOldName3
f1b5ad5804
Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings.
9 years ago
GrimKriegor
ace719507c
Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1
...
https://github.com/TES3MP/TES3MP/issues/1
9 years ago
AnyOldName3
e6f78ae5b7
Switch indentation to spaces to remain consistent with the rest of the project
9 years ago
AnyOldName3
08df463c94
Separate declaration and definition of some static members to hopefully calm Travis down.
9 years ago
AnyOldName3
7475d90693
Fix dodgy include by changing backslashes to forwardslashes
9 years ago
AnyOldName3
5121e77a95
Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it
9 years ago
AnyOldName3
1a0642f1db
Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing
9 years ago
AnyOldName3
195dd27780
Resolve obvious runtime error revealing more subtle one
9 years ago
MiroslavR
9c6739f1b3
Fix doubled particle spawn range
9 years ago
AnyOldName3
fbe6dc9704
Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++
9 years ago
AnyOldName3
7697406467
Partially fix '2 overloads have similar conversions' compilation error
9 years ago
AnyOldName3
2a9b12bb3f
Fix an issue preventing compilation, revealing another that doesn't make much sense.
9 years ago
AnyOldName3
c1ffc9e776
Remove a compilation error and set up framework to remove the others
9 years ago
AnyOldName3
e17e354e84
Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors
9 years ago
MiroslavR
2a987b6857
Do not skip inactive keyframe controllers (Bug #1942 )
9 years ago
scrawl
9375cbea44
Make NIFFilePtr const
9 years ago
scrawl
da0e20edcd
Merge pull request #991 from MiroslavR/opface
...
Implement Face instruction (Feature #1424 )
9 years ago
MiroslavR
f6f3f71db5
Improve format specifiers for message boxes
9 years ago
MiroslavR
dc0bc5b68c
Implement Face instruction (Feature #1424 )
9 years ago
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
scrawl
e362e3e6a5
Fix cppcheck warnings
9 years ago
scrawl
dca0e2f582
Pass a Vec4f by reference
9 years ago
scrawl
215567c9c3
Update ScriptArgs documentation
9 years ago
scrawl
e9b02a13c3
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
scrawl
f375d07c16
ExprParser: Warn about ignored arguments
9 years ago
scrawl
84a9df9793
Do not discard root node transformations if the root node is named 'bip01' (Bug #3118 )
9 years ago
scrawl
8f62ea2e80
Fix for "RigGeometry rendering with no skeleton" errors
9 years ago
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
9 years ago
scrawl
d5f497c47d
Pass the node path instead of the node visitor
9 years ago
scrawl
6fa95e72c5
Pass the traversal number instead of the node visitor
9 years ago
MiroslavR
54f52f7bae
Implement effect removal for abilities ( Fixes #3455 )
9 years ago
MiroslavR
b99611a730
Initialize mSpecIncreases in ESM::NpcStats::load
9 years ago
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
9 years ago
scrawl
824cd3be22
Do not set _boundingBoxComputed which is no longer used
9 years ago
scrawl
372f2e2f18
Merge pull request #962 from Allofich/AIPackageFixes
...
Duration fixes for Follow and Escort
9 years ago
Allofich
3bebbab78e
Duration fixes for Follow and Escort
9 years ago
scrawl
197e81206a
Assume mDeathAnimationFinished is true for older save files
9 years ago
scrawl
a825882c6b
Process death events at the end of the death animation ( Fixes #1873 )
9 years ago
scrawl
cb8daaaee1
Do not query the texture's image in osgMyGUI::OSGTexture
...
Doing so could result in a race condition if the draw thread is about to delete the image (UnRefImageDataAfterApply enabled)
9 years ago
Allofich
55ac1fab68
Change Wander duration to run on a counter
9 years ago
Marc Zinnschlag
b079db7913
Merge remote-tracking branch 'aesylwinn/EditPathgrid'
9 years ago
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
Aesylwinn
b83f522ecd
Changes to color scheme, slight change to drag indicator,
...
change tooltip description.
9 years ago
Aesylwinn
564d0db68c
Move pathgrid abstraction handling to save code.
9 years ago
scrawl
3749821809
Choose a random death animation for actors that start the game as dead ( Fixes #3397 )
9 years ago
Aesylwinn
1781aaaa27
Drag indicator.
9 years ago
scrawl
04b537bf5f
Minor cleanup
9 years ago
scrawl
85b0c4393b
Remove obsolete code
9 years ago
scrawl
6e0c3b2413
Revert commit 16ac6e7aac
( Fixes #3394 )
9 years ago
scrawl
62018e802b
Minor fix to particle system AutoPlay flag handling
...
The previous commit broke some magic effects (e.g. shield). The controller's emit start/stop times should control the emitter, while the absence of the ParticleSystem's autoplay flag should freeze the whole particle system if no valid controller source gets assigned. This revised version works for both the Shield effect and the "dagoth ur death sparkles" effect.
9 years ago
scrawl
7202072196
Freeze particle systems on construction if the AutoPlay flag is missing
9 years ago
scrawl
0c08f705c5
Make the ParticleSystemController freeze the particle system instead of the emitter (Bug #3390 )
9 years ago
scrawl
e30bb31a79
Handle the particle node's AutoPlay flag (Bug #3390 )
9 years ago
Aesylwinn
32ba5bf8b8
Initial pathgrid editting, support for selection and movement.
9 years ago
scrawl
fcbcc004a3
Don't use unordered_map
9 years ago
scrawl
17a0353a85
Fix forward declaration mismatch
9 years ago
scrawl
a7e6219091
Merge pull request #939 from kpp/rewrite_esm_name_t
...
Rewrite ESM::NAME_T
9 years ago
Marc Zinnschlag
b4e341e1e2
Merge remote-tracking branch 'aesylwinn/RenderPathgrid'
9 years ago
Roman Proskuryakov
d5dfa89060
Rewrite NAME_T into FIXED_STRING.
9 years ago
Roman Proskuryakov
1e7d573f24
Fix uninitialized values in ESMWriter::save
9 years ago
Aesylwinn
14ae232938
Remove now unnecessary factory class.
...
It was originally used for storing normals, but that functionality
was removed.
9 years ago
Aesylwinn
b11f5b2717
Make edges differently colored.
9 years ago
Aesylwinn
0eb863d8fc
Change color to blue to match the pathgrid visibility selector in the
...
editor and slightly increase the scaling.
9 years ago
Aesylwinn
7f0cc6e583
Add a color gradiant to pathgrid nodes to make them less of an eyesore.
9 years ago
Aesylwinn
3d26ff08c4
Get rid of lighting.
9 years ago
Aesylwinn
d141672b53
Pathgrid geometry creator
9 years ago
scrawl
5f34fb0c41
Remove call to MYGUI_DBG_BREAK which was removed in mygui-git
9 years ago
scrawl
f3e9fd49f3
Don't add the autodetected mw path in global config file
...
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
9 years ago
scrawl
2f8be401cc
Add the unref work items to the front of the workqueue (Bug #3273 )
...
Ensures that memory still gets freed even if the workqueue is overloaded.
9 years ago
scrawl
bc36269617
When a controller is present more than once in the same keyframe file, pick the first one ( Fixes #2719 )
9 years ago
scrawl
8052225460
Remove leftover call to setTexCoordArrayList
9 years ago
scrawl
cc0afe901f
Store a pointer to tangents array to avoid potential type casting issue
9 years ago
scrawl
d1f6169889
Add special handling of RigGeometry tangents in ShaderVisitor
9 years ago
scrawl
95e80e7eff
RigGeometry: don't directly modify the primitive set list
...
This is to ensure that an element buffer object will be assigned to the primitive sets if necessary.
9 years ago
scrawl
c73ec71123
Revert "Store the RigGeometry's source vertices and normals directly"
...
This reverts commit 7a347e3483
.
9 years ago
scrawl
60c8c4fdda
Revert "Animate tangents in RigGeometry"
...
This reverts commit 9cf963b751
.
9 years ago
scrawl
9cf963b751
Animate tangents in RigGeometry
9 years ago
scrawl
7a347e3483
Store the RigGeometry's source vertices and normals directly
9 years ago
scrawl
6f31b3d79f
Add parallax mapping for objects
9 years ago
scrawl
df6fd5f206
Recognize normalHeightMap in the ShaderVisitor
9 years ago
scrawl
157c11398d
Add terrain parallax mapping
9 years ago
scrawl
24ae9f4ac1
Remove no longer needed apply(Geode&) in SetFilterSettingsVisitor and NodeToShapeVisitor
...
In OSG 3.4 (which is now a requirement), Drawables are normal Nodes attached in the scene graph. Geode is still provided for backwards compatibility, but does not need to be specially handled here because it now functions just like a normal Group node.
9 years ago
scrawl
e8caafa190
Remove no longer needed applyEffect(osgFX::Effect&) in SetFilterSettingsVisitor
...
No longer needed because terrain texture filtering is now updated manually in TerrainGrid::updateTextureFiltering.
9 years ago
scrawl
d7c7bb850b
ToggleAI cleanup
9 years ago
scrawl
d986b1a48b
Add comment
9 years ago
scrawl
1abb77f8a1
Cleanup
9 years ago
scrawl
9f03982e0b
Use a dedicated VBO for RigGeometry's vertices and normals
...
The VBO used by the source geometry's arrays may be unintentionally shared with other RigGeometries.
The vertices and normals are the only attributes that are modified at all, so using a dedicated VBO for these should improve performance further.
9 years ago
scrawl
50b8260a39
Disable VBOs in RigGeometry while investigating a crash possibly related to commit cda8a88f0d
9 years ago
scrawl
aae43dbff5
Set the MorphGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
9 years ago
scrawl
4eb090a8d0
Set the RigGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
9 years ago
scrawl
174dd82894
Manually apply the osg::Light state
...
Reduce the amount of virtual function calls. Don't use the osg::Light's lightNum. Don't set spotlight state that we're not using (yet).
9 years ago
scrawl
58e0e8bd4e
Enable vertex buffer objects in RigGeometry
9 years ago
scrawl
0dbf44b414
Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency
9 years ago
scrawl
3f08cbff71
Share the state attributes for terrain techniques
...
Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene.
9 years ago
scrawl
84b8da7a09
Share the osg::Material on drawables
...
Reduces the number of GL calls / frame by ~4%.
9 years ago
scrawl
abcfe9bcee
Don't add empty text key objects
9 years ago
scrawl
02d23564dc
Include cleanup
9 years ago
scrawl
f898bf493f
Don't use Geodes
9 years ago
scrawl
137dde7cf8
Include cleanup
9 years ago
scrawl
121bdd3e39
Update comment
9 years ago
scrawl
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
9 years ago
scrawl
0df975a4d7
Properly detach nodes in CopyRigVisitor ( Fixes #3234 )
9 years ago
scrawl
82b792f808
Eliminate dynamic_cast in BillboardCallback
9 years ago
scrawl
2eaf96e3bf
Make ResourceManager destructor virtual
9 years ago
scrawl
dd2fbfc0a2
Fix windows build
9 years ago
scrawl
3d6323f13a
Force-enable hasWater() for exterior cells ( Fixes #3222 )
9 years ago
scrawl
563807ee53
Share the StateSet used to invert front face
9 years ago
scrawl
6e7c6fdd7e
Implement NiTexturingProperty::DecalTexture
9 years ago
scrawl
30d06bfe0e
Add comment
9 years ago
scrawl
64636bd85a
Improve error reporting
9 years ago
scrawl
2821f46a18
Corpse clearing fix
9 years ago
scrawl
8791063110
Fix "RigGeometry rendering with no skeleton" warnings in rare cases
9 years ago
scrawl
1e5b4bea0a
Don't create an unnecessary osg::Group when copying over a rig
9 years ago
scrawl
27577ce765
Add ESM::Land::DEFAULT_HEIGHT
9 years ago
Marc Zinnschlag
ebaeabc962
Merge remote-tracking branch 'scrawl/respawn'
9 years ago
scrawl
3a2dccad4b
Implement 'Show' script instruction
9 years ago
scrawl
c3ef387208
Vanilla-compatible creature/NPC respawning ( Fixes #2369 , Fixes #2467 )
9 years ago
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
9 years ago
scrawl
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
9 years ago
scrawl
cdccf03228
Fix mismatched delete
9 years ago
sandstranger
a7b78b37f5
disable opengles for Android by default
9 years ago
scrawl
5f4ace1bc2
Implement support for sphere map NiTextureEffects ( Fixes #1827 )
9 years ago
scrawl
062410bd8c
Don't incorrectly remove TexEnv state
9 years ago
scrawl
90a99991d1
Use empty() instead of !size()
9 years ago
scrawl
8bd16e4d5a
Don't compute the world matrix multiple times
9 years ago
scrawl
055d35a2b0
Revert "Warn about particle emitters that have multiple parent node paths"
...
Not working correctly because osg won't ignore camera nodes.
This reverts commit 1667c807be
.
9 years ago
scrawl
1667c807be
Warn about particle emitters that have multiple parent node paths
9 years ago
Marc Zinnschlag
f9f91d5386
Merge remote-tracking branch 'origin/master'
9 years ago
scrawl
cee608e31b
Make it work with appveyor's outdated OSG build
9 years ago
scrawl
8e826eefe6
Add missing initialization
9 years ago
scrawl
e25e0a0600
ShaderVisitor: assume the first texture unit is the diffuseMap
9 years ago
scrawl
e7682e04ae
Cleanup
9 years ago
scrawl
cdefee3e64
Add call to MultiObjectCache::releaseGLObjects
9 years ago
scrawl
4ca6e91292
Fix in-code default settings so that we don't attempt to use shaders in OpenCS
9 years ago
scrawl
8f81df2bd3
Cleanup
9 years ago
scrawl
0db7163363
Add specular mapping for terrain
9 years ago
scrawl
171e293641
ShaderManager: insert #line directives when including files
9 years ago
scrawl
f01e8a6950
Add specular mapping for objects
9 years ago
scrawl
5cf2441b10
ShaderVisitor: support automatic recognition of normal maps based on file pattern
...
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
9 years ago
scrawl
6a0ac824bd
Fix terrain error in OpenCS
9 years ago
scrawl
7071d286e8
Fix inverted check for 16-bit indices
9 years ago
scrawl
4e5462bc19
Don't attempt to create a collision shape for an empty TriShape
9 years ago
scrawl
ca0e1fe0e0
Set the osg::Material on the terrain root node
9 years ago
scrawl
6000e48bba
Add terrain shaders and normal map support
...
Textures with _n filename suffix are automatically recognized as terrain normal maps.
9 years ago
scrawl
5e12a1b4ef
Add enchanted item glow to the shader
9 years ago
scrawl
268594dcf1
Recreate shader in NpcAnimation::setAlpha
9 years ago
scrawl
a73512afb7
Add shader settings to settings.cfg
9 years ago
scrawl
21c4dffed2
Add #include support in shaders
9 years ago
scrawl
22cc5c0965
Cache the Program
9 years ago
scrawl
456816f707
Use diffuse.a / vertex.a, use material emission
9 years ago
scrawl
3e854a84a2
Slightly more efficient applying of light state
9 years ago
scrawl
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
scrawl
9376811213
Vertex lighting shader
9 years ago
scrawl
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
9 years ago
scrawl
e647ee5424
Support RGB and RGBA embedded textures in NIF files ( Fixes #2295 )
9 years ago
scrawl
a9ac108382
Fully read NiPixelData
9 years ago
scrawl
606758d72f
NifLoader: create the BumpTexture slot, but don't use it yet
9 years ago
scrawl
4cd4131da9
NifLoader: assign a name to created textures
...
This name will tell the shader visitor how to handle that texture.
9 years ago
scrawl
50e92c8136
NifLoader: move texture property handling to a separate function
9 years ago
scrawl
acf44fd9e5
NifLoader: handleTextureControllers outside of the NumTextures loop
9 years ago
scrawl
e05d975020
Change the way that texture filtering settings are applied at runtime
9 years ago
scrawl
a94029267f
Fix an inverted condition (Bug #3209 )
9 years ago
scrawl
c4d38bb42d
Fix clang analyzer warnings
9 years ago
scrawl
ed57293e54
Allow '^' escape characters in books
...
http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7
9 years ago
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
9 years ago
scrawl
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
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
9 years ago
scrawl
eaf3f5a829
Remove unused arguments
9 years ago
scrawl
6fc6913424
Do not set the cursor when creating it
9 years ago
scrawl
5824619a95
Clean up includes
9 years ago
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
9 years ago
scrawl
be6ea3d607
Account for UV coordinate flip in UVController ( Fixes #3203 )
9 years ago
Marc Zinnschlag
da6dcfc49e
Merge remote-tracking branch 'scrawl/resource'
9 years ago
scrawl
5e876b1379
Add missing include
9 years ago
scrawl
98c5e072f2
Swap the terrain cache update order to make more sense
9 years ago
scrawl
9f729667fb
Remove debug output
9 years ago
scrawl
0865cea211
Preload terrain
9 years ago
scrawl
98848c752a
Make getLayerInfo thread safe
9 years ago
scrawl
8aba74e6ee
Remove GridElement
9 years ago
scrawl
596fe56bfd
Make Land::loadData thread safe
9 years ago
scrawl
afe533e670
Accept a const Object in UnrefQueue
9 years ago
scrawl
246566cef4
Preload instances in BulletShapeManager
9 years ago
scrawl
e28dc3e72f
Preload instances in SceneManager
9 years ago
scrawl
2e62298bd3
Clean up ObjectCache includes
9 years ago
scrawl
40a6e05e17
Use a deque instead of vector in UnrefQueue
9 years ago
scrawl
d11c2864df
Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread
9 years ago
scrawl
84f01b7527
Remove unneeded forward declaration
9 years ago
scrawl
b2019d31c7
Mark thread safe methods in BsaFile
9 years ago
scrawl
e4e313fe12
Remove outdated comment
9 years ago
scrawl
c8054424c9
Preload items equipped by NPCs
9 years ago
scrawl
a81b10b415
Make the cache expiryDelay configurable
9 years ago
scrawl
41233fc8e5
Keep a reference to the original scene template for as long as the instance is used
9 years ago
scrawl
778bce3ae9
Remove unused ObjectCache functions
9 years ago
scrawl
49ecac4ced
Add a mutex lock around the SharedStateManager
9 years ago
scrawl
c3ad4dad75
Fix applying of filter settings on terrain textures
9 years ago
scrawl
8b981ab507
Crash fix
9 years ago
scrawl
c155680d3c
Customize ObjectCache for more efficient locking in removeExpiredObjectsInCache
9 years ago
scrawl
d855a13b44
Clear the resource cache from the worker thread
9 years ago
scrawl
6f9ca0f68f
Add basic cell preloader class
...
Not properly in use yet, but seems to be working.
9 years ago
scrawl
e055ae094a
Improve const-correctness in BulletShapeManager
...
Sadly, two const_cast's are needed to work around Bullet API quirks.
9 years ago
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.
9 years ago
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.
9 years ago
scrawl
e02f35264f
Work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag ( Fixes #3183 )
9 years ago
scrawl
ea1efaac0c
Use the osgDB::ObjectCache in SceneManager, cleanup
9 years ago
scrawl
909c4d96b6
Use the osgDB::ObjectCache in BulletShapeManager
9 years ago
scrawl
6c1c653cba
Use the osgDB::ObjectCache in ImageManager
...
Should be thread safe now.
9 years ago
scrawl
9e5225bb6f
Do not unref a Texture's image data after applying it
9 years ago
scrawl
9e53e12c70
More renaming of TextureManager -> ImageManager
9 years ago
scrawl
5ee3d1698f
Remove getWarningTexture in favor of getWarningImage
9 years ago
scrawl
f99f403dda
Rename TextureManager to ImageManager
9 years ago
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.
9 years ago
scrawl
fbd4ad9b0c
Flip terrain textures
9 years ago
scrawl
71401aafe7
Handle multipass techniques in SetFilterSettingsVisitor
9 years ago
scrawl
31988ca4cc
Add a dont_override_filter description for textures that should be left alone
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
scrawl
b06730ac61
Fix terrain textureCompileDummy
9 years ago
scrawl
2eda495f89
Build fix for OSG 3.2
9 years ago
scrawl
06ed20abf8
Use the initial pose of a MorphGeometry for object placement ( Fixes #3136 )
9 years ago
scrawl
8360cccce7
Don't clone Drawable UpdateCallbacks twice
...
The Drawable copy constructor takes care of that already.
9 years ago
scrawl
6b48acaf0e
Don't optimize TriShapes with controllers ( Fixes #3143 )
9 years ago
scrawl
d9290b0ee0
Array fix
9 years ago
scrawl
aec8c38461
Move observer_ptr include where it belongs
9 years ago
scrawl
48f53e23bf
Allow alternate mesh formats for marker_error
9 years ago
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
9 years ago
scrawl
f0971ee8ad
Implement Fixme script instruction
9 years ago
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
9 years ago
scrawl
62fe47b144
Load default terrain if there is none defined
9 years ago
scrawl
458a305bff
OpenCS: add lighting mask
9 years ago
scrawl
e1c7165bfb
Fix bounds calculation for addLight to a transform node
9 years ago
scrawl
93cc08a09c
Lighting fix for LightListCallbacks attached to a Transform node
9 years ago
scrawl
3089aeccc4
Factor out SceneUtil::addLight
9 years ago
scrawl
438b30d6f0
Move configureLight to a separate file
9 years ago
scrawl
11496b8075
Read fallback settings in OpenCS
9 years ago
scrawl
6546c05428
Move Fallback map to components/
9 years ago
Marc Zinnschlag
ece40b1e96
improved the remaining handling of extra arguments
9 years ago
Marc Zinnschlag
46e32de350
improved handling of extra arguments in DiscardParser
9 years ago
Marc Zinnschlag
f9607a47b3
improved handling of extra arguments in StringParser
9 years ago
Marc Zinnschlag
210c77968a
Don't report warning about extra arguments, if there are no extra arguments ( Fixes #3133 )
9 years ago
scrawl
daa94cc50e
Fix cppcheck warnings
9 years ago
scrawl
0597c8fd9c
Pass a Vec4f by reference
9 years ago
scrawl
ea0be6e737
Update ScriptArgs documentation
9 years ago
scrawl
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
scrawl
e695619aa5
ExprParser: Warn about ignored arguments
9 years ago
scrawl
3ebfb47983
Do not discard root node transformations if the root node is named 'bip01' (Bug #3118 )
9 years ago
Alexander "Ace" Olofsson
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
scrawl
deb7f3caf6
Print deletion state in ObjectReferenceInfo
9 years ago
scrawl
723c392a73
NifLoader: fall back to the first UV set when encountering invalid UV set references
9 years ago
scrawl
0731595c2b
Wrap a Texture2D in a ref_ptr
9 years ago
scrawl
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
scrawl
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
scrawl
625644e917
LoadingScreen: documentation updates
9 years ago
scrawl
ccbba5e926
LoadingScreen: remove indicateProgress, not used
9 years ago
scrawl
78a733a12c
Fix initialization of InputWrapper::mWindowHasFocus
9 years ago
scrawl
c70790ecb7
Remove outdated comment
9 years ago
scrawl
076dc539bc
KeyframeManager fix
9 years ago
Chris Robinson
f1faeeae3a
Use separate config options for min and mag texture filters
9 years ago
Chris Robinson
5c0a847eaf
Combine some duplicate code
9 years ago
scrawl
64424e7262
Move keyframe loading out of SceneManager to new KeyframeManager
9 years ago
scrawl
295563ba65
Minor fix
9 years ago
scrawl
6f966b8434
Don't use osg::notify
9 years ago
Paul Cercueil
06719df868
Use the standard cursor if the custom cursor can't be used
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
scrawl
0efce6cd4c
Fix typo in a comment
9 years ago
scrawl
eb92b853fe
BulletNifLoader: preallocate the btTriangleMesh's vertices/indices
9 years ago
scrawl
293f3f30b5
Indentation fix
9 years ago
scrawl
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
MatthewRock
3b254ad631
Allows the same item to have multiple ancestors
9 years ago
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
9 years ago
cfcohen
d00d487c3d
Improved error reporting under POSIX using errno and strerror().
9 years ago
scrawl
de84452e5a
NifFile: close the stream after reading ( Fixes #3070 )
9 years ago
scrawl
39feb547a0
Broken lower casing fix ( Fixes #3068 )
9 years ago
MatthewRock
aa721fe1f6
Fix bug 2952 with merchant and levelled items
9 years ago
scrawl
624809c8dc
Minor fix for error handling in skeleton.cpp
9 years ago
scrawl
07b064f616
Rename to lowerCaseInPlace
9 years ago
scrawl
e3d3380c8c
Remove return value for in-place toLowerStr
9 years ago
scrawl
e4751c68e9
Typo fix
9 years ago
scrawl
42d68eb7fb
Build fix
9 years ago
scrawl
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
9 years ago
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
9 years ago
scrawl
671561ea37
Write moved references to the save game file (not resolved on loading yet)
9 years ago
scrawl
1d5af3c9c8
Remove unneeded cast
9 years ago
scrawl
e39f49a88f
OSG extensions namespace fixes
9 years ago
scrawl
c60f4ba7bd
Make RigGeometry bone references case-insensitive ( Fixes #3058 )
9 years ago
scrawl
258f7a2b42
LightController fixes
9 years ago
scrawl
4a9b37aa53
Fix copy constructor issue
9 years ago
scrawl
c442af09c5
Write more documentation for the lighting system
9 years ago
scrawl
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
scrawl
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
1f8ee9b8d1
StateSetUpdater: use the frameNumber
...
More robust in case a node is updated twice in the same frame (e.g. because it has multiple parents).
9 years ago
scrawl
f22982d251
Merge pull request #835 from sandstranger/opengles1
...
enable opengl es1
9 years ago
scrawl
eb458bf9c8
Fix inactive RigGeometry not rendering correctly
9 years ago
sandstranger
7d374b36fd
change cmake variables
9 years ago
Marc Zinnschlag
06efd72a89
allow keywords as strings in messagebox instruction ( Fixes #2991 )
9 years ago
sandstranger
238a5824be
add custom new variable fot Qt
9 years ago
sandstranger
bd5057aa3c
enable opengl es1
9 years ago
scrawl
647bed7f40
Do not read openmw.cfg from global path if one was found in the local path
9 years ago
scrawl
87e44bf627
Small fix
9 years ago
scrawl
d3fa8a8602
Add osgDB::ObjectCache to the repository to work around it not being available in OSG 3.2
9 years ago
scrawl
a29aef14f1
Eliminate a dynamic_cast in ParticleSystemController
9 years ago
scrawl
6cf2c35235
Don't rely on the _particles vector implementation details
...
This will allow compiling OpenMW with an osgParticle optimization to be pushed to OpenMW/osg.
9 years ago
scrawl
3d12b2ca9d
Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager.
9 years ago
scrawl
c9d710f334
Use a typedef to avoid conditional compiling
9 years ago
Alexander "Ace" Olofsson
cfcbd20d99
Let's put it as a MSVC-only fix for now
9 years ago
Alexander "Ace" Olofsson
e42f4999bd
Quick fix for building on MSVC
9 years ago