scrawl
604580d75d
Move toMatrix to Nif::Node
2015-05-07 21:17:15 +02:00
scrawl
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
2015-05-04 02:41:50 +02:00
Marc Zinnschlag
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
2015-05-03 09:54:32 +02:00
scrawl
d9d84bd7b2
Remove bullet raycasting shapes, to be replaced with OSG ray casts
2015-05-01 21:43:21 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
scrawl
7bc0d41bb0
Marker collision fix ( Fixes #2461 )
2015-03-19 15:51:45 +01:00
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
scrawl
0ad514b29b
Fix collision for nodes with MRK extra data ( Fixes #2415 )
2015-03-02 01:03:03 +01:00
scrawl
d387c207d1
Fix initial scaling for btCompoundShape children ( Fixes #2234 )
2015-01-14 18:49:25 +01:00
scrawl
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01:00
scrawl
883f7ec7ce
Move workaround for hiding markers from NIF loader to Scene
2015-01-13 17:19:39 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
04d6cead3b
Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node ( Fixes #2133 )
2015-01-12 23:29:57 +01:00
scrawl
5fa7536427
Fix incorrect box shape translation reset
...
Fixes incorrect placement of collision box for "azura spirit_trib"
2014-11-29 16:50:42 +01:00
scrawl
6b82e3665b
Remove old nifbullet test
2014-09-26 16:10:55 +02:00
Rohit Nirmal
b5eb16b663
Silence some scan-build warnings.
2014-08-28 20:55:32 -05:00
scrawl
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.
2014-08-24 02:37:50 +02:00
scrawl
1ab02d8072
Fix exception for box shapes ( Fixes #1580 )
2014-06-28 00:10:36 +02:00
scrawl
2bcbc6ab7d
Potential crash fix, either way should have a better error message now
2014-06-25 14:52:12 +02:00
scrawl
0b34d8d2fd
Add support for animated collision shapes ( Fixes #1549 )
2014-06-23 20:43:24 +02:00
scrawl
0bed6d9d56
Physics: Recognize BBoxCollision flag, but don't use it for raycasting ( Fixes #1349 )
2014-06-22 00:16:47 +02:00
scrawl
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.
2014-06-21 23:37:16 +02:00
scrawl
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.
2014-01-15 14:53:29 +01:00
scrawl
79a6ffd216
Closes #1107 : Do not create box shapes unless the box collision flag is enabled
2014-01-15 14:53:29 +01:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
Chris Robinson
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.
2013-04-28 11:12:55 -07:00
Chris Robinson
36170c5374
Use flag enums instead of hard-coded hex values
2013-04-16 01:20:32 -07:00
Chris Robinson
ebcb4c66c3
Properly read and use the NIF root record list
2013-04-06 10:17:09 -07:00
scrawl
e30af28860
Markers should still have collision if they have a NiRootCollisionNode
2013-03-14 19:03:42 +01:00
scrawl
84afd87321
Placeable objects should not collide unless they have a NiRootCollisionNode
2013-03-14 03:04:02 +01:00
scrawl
14964e9fcd
Only build a box shape for collision nodes; use StringUtils
2013-03-09 10:28:10 +01:00
scrawl
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
2013-03-08 23:46:25 +01:00
Nathan Jeffords
109dff2d29
renamed high level NIF files...
2013-03-02 13:23:09 -08:00
Nathan Jeffords
d3c1f5e7b2
renamed low-level NIF related files and include guards to conform to naming convention
2013-03-02 10:46:12 -08:00
Chris Robinson
5f2c897001
Better handle which collision shapes to load
2013-02-25 10:29:48 -08:00
scrawl
f4749f10da
NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)
2013-02-20 05:35:52 +01:00
Nathan Jeffords
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.
2013-01-10 21:47:02 -08:00
Nathan Jeffords
0989b44b41
spread some const around NIF loading
2013-01-10 21:32:47 -08:00
Nathan Jeffords
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.
2013-01-10 21:32:32 -08:00
scrawl
00a2de432a
fix BulletShapeLoader namespace
2012-11-08 18:48:07 +01:00
scrawl
4ca0eb93ee
fix markers used for raycasting and blocking activation
2012-10-24 17:47:03 +02:00
scrawl
bf3aad8be0
handle NCC flag
2012-09-23 18:30:13 +02:00
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
2012-09-18 11:25:09 +02:00
scrawl
b5ddc8d4fb
Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision.
2012-09-13 13:10:02 +02:00
scrawl
906d290935
Markers are actually hidden now. Inspecting the markers in NifSkope revealed why it didn't work previously: the flag that is being looked for is not present in any of the markers, nor any other flag or extra data to identify them. However, the root node name always starts with "marker", making it possible to do a string search.
2012-09-12 12:41:12 +02:00
Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
2012-09-10 20:29:24 -04:00
Jason Hooks
8762f4a47a
boxrotation nif field; commented functions
2012-08-15 16:47:26 -04:00
Jason Hooks
1f5bc229e0
Separate adjustRigidBody function
2012-08-14 18:04:58 -04:00
Jason Hooks
e7329d5f8b
Creatures now have a properly positioned box shape
2012-08-12 00:36:49 -04:00
Jason Hooks
083e3537b4
post merge
2012-08-09 17:21:59 -04:00
Jason Hooks
cacf0bd10d
Basic collision with npcs
2012-08-04 15:43:33 -04:00
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
2012-07-17 10:57:15 -07:00
guidoj
a021165d9f
Changed standard C lib includes to C++ format
2012-07-17 09:44:24 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Chris Robinson
9436ca4b0c
Use vectors for ShapeData properties
2012-07-13 09:32:58 -07:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07:00
Chris Robinson
86b37c6c11
Move the velocity out of the transformation object
2012-07-12 11:21:52 -07:00
Chris Robinson
645b507ba0
Return a reference to the RecordPtr from operator[] for consistency
...
RecordListT is supposed to be a list of RecordPtrT objects.
2012-07-12 05:37:56 -07:00
Chris Robinson
348b5fa207
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nifbullet/bullet_nif_loader.cpp
2012-07-10 06:16:16 -07:00
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
2012-07-10 13:23:41 +02:00
Chris Robinson
ca37706b34
Use Ogre types for Matrix and Vector objects
2012-07-10 02:38:35 -07:00
Chris Robinson
b3aa453f9a
Use Ogre data streams for loading NIFs
2012-07-09 22:02:12 -07:00
Chris Robinson
0143cacd2b
Avoid returning pointers from NIFFile
2012-07-09 21:35:36 -07:00
Chris Robinson
d3a31a24ce
Use proper strings and vectors instead of slice arrays for NIF files
...
Slice arrays use pre-allocated pointers whose memory is managed externally. This is
unnecessary and ultimately detrimental since it prevents any kind of data fixup
(e.g. little endian to big endian, p[adding handling), and it also makes it difficult
to use Ogre data streams.
2012-07-09 21:08:23 -07:00
Jason Hooks
595b0729da
Few things changed
2012-06-10 21:08:58 -04:00
Jason Hooks
fb0a52809d
Changing transformation processing
2012-06-09 15:19:15 -04:00
Jason Hooks
4ff36a9018
Bullet loader trafos changed to match NIFLoader
2012-06-06 16:29:44 -04:00
gugus
6f87493df6
fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much)
2012-05-17 15:46:38 +02:00
Lukasz Gromanowski
d3b88b9e34
Issue #225 : Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
2012-03-26 19:09:55 +02:00
gugus
241cf2555d
Fixe collision shape bug.
2011-10-29 13:35:43 +02:00
gugus
1bf7c4e53d
Improve bullet performances
2011-08-03 11:41:16 +02:00
Lukasz Gromanowski
2ddd5dba11
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifbullet into NifBullet namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:45:23 +02:00
Jan-Peter Nilsson
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
2011-04-03 13:20:42 +02:00
gugus
3ad2b9986e
fix actors not beeing deleted. Need the latest OEngine.
2011-03-23 19:16:51 +01:00
gugus
b2194398a4
fixed a bug in loading. Every collision mesh is correctly loaded now.
2011-03-23 13:42:28 +01:00
gugus
9d4cda6510
OEngine doesn't rely on OpenMW anymore
2011-03-18 13:22:09 +01:00
Jan-Peter Nilsson
26b780d1ac
Remove unused variables and fix signed/unsigned comparison to make the compiler happy
2011-02-27 00:48:49 +01:00
Marc Zinnschlag
1e9dc4b435
de-Windownizing and some build-fixes
2011-02-26 16:37:47 +01:00
gugus
86ded891d9
modified the nif loader for shapes used for raycasting only.
2011-02-22 20:53:58 +01:00
gugus
d3c1640723
add physic support
2011-02-22 14:11:53 +01:00
gugus
a8ade56c80
Add a bullet Shape Loader
2011-01-13 17:51:50 +01:00
