b3f5ac5dbb
Include cleanup
10 years ago
a7c5beb7c5
Remove redundant allocations for NIF meshes
10 years ago
712cef36b0
Minor cleanup
10 years ago
cdc47fa874
Remove BulletNifLoader dependency on keyframe manager
...
This will make threaded loading easier.
10 years ago
fe439e53ff
Bullet include cleanup
10 years ago
82316105de
BulletShapeManager kf loading fix
10 years ago
65f0195c71
Readded animated collision shape support
10 years ago
47758c11cd
Readded collision objects and movement physics
10 years ago
c843cfc8e2
Physics stub in preparation for rewrite
10 years ago
48ffeab191
Remove old BulletShapeManager
10 years ago
604580d75d
Move toMatrix to Nif::Node
10 years ago
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
10 years ago
d9d84bd7b2
Remove bullet raycasting shapes, to be replaced with OSG ray casts
10 years ago
997347b01e
Silence -Wreorder warnings.
10 years ago
7bc0d41bb0
Marker collision fix ( Fixes #2461 )
10 years ago
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
10 years ago
0ad514b29b
Fix collision for nodes with MRK extra data ( Fixes #2415 )
10 years ago
d387c207d1
Fix initial scaling for btCompoundShape children ( Fixes #2234 )
10 years ago
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
10 years ago
883f7ec7ce
Move workaround for hiding markers from NIF loader to Scene
10 years ago
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
10 years ago
04d6cead3b
Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node ( Fixes #2133 )
10 years ago
5fa7536427
Fix incorrect box shape translation reset
...
Fixes incorrect placement of collision box for "azura spirit_trib"
10 years ago
6b82e3665b
Remove old nifbullet test
10 years ago
b5eb16b663
Silence some scan-build warnings.
10 years ago
2b407a9995
Refactor NIF cache
...
- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
- Decouple cache from NIFFile (now a new nifcache component)
- Add API for future background loading
- Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
11 years ago
1ab02d8072
Fix exception for box shapes ( Fixes #1580 )
11 years ago
2bcbc6ab7d
Potential crash fix, either way should have a better error message now
11 years ago
0b34d8d2fd
Add support for animated collision shapes ( Fixes #1549 )
11 years ago
0bed6d9d56
Physics: Recognize BBoxCollision flag, but don't use it for raycasting ( Fixes #1349 )
11 years ago
e002acdeae
Physics: Create actor shapes outside of BulletNifLoader
...
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
11 years ago
0a8c61a7fe
Bug #1107 : Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.
11 years ago
79a6ffd216
Closes #1107 : Do not create box shapes unless the box collision flag is enabled
11 years ago
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
4cedf0fbab
Avoid colliding with AvoidNodes
...
These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI.
12 years ago
36170c5374
Use flag enums instead of hard-coded hex values
12 years ago
ebcb4c66c3
Properly read and use the NIF root record list
12 years ago
e30af28860
Markers should still have collision if they have a NiRootCollisionNode
12 years ago
84afd87321
Placeable objects should not collide unless they have a NiRootCollisionNode
12 years ago
14964e9fcd
Only build a box shape for collision nodes; use StringUtils
12 years ago
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
12 years ago
109dff2d29
renamed high level NIF files...
12 years ago
d3c1f5e7b2
renamed low-level NIF related files and include guards to conform to naming convention
12 years ago
5f2c897001
Better handle which collision shapes to load
12 years ago
f4749f10da
NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)
12 years ago
d5ebd6654d
cache loaded NIF files to eliminate reloads
...
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
12 years ago
0989b44b41
spread some const around NIF loading
12 years ago
9d4f8c6722
changed bullet_nif_loader to not modifiy NIF file
...
The code in bullet_nif_loader was modifing the loaded NIF file as part of
processing. Currently this is OK since the NIF file will be thrown away
immediately, but it causes problems when trying to share loaded NIF files.
12 years ago
00a2de432a
fix BulletShapeLoader namespace
12 years ago
scrawl
Marc Zinnschlag
Rohit Nirmal
dteviot
Chris Robinson
Nathan Jeffords