Commit graph

3650 commits

Author SHA1 Message Date
Chris Robinson
2890904fb5 Use lowercase names for the mesh and skeleton resources
To reduce the risk of duplicates due to different capitalizations.
2012-07-18 15:27:33 -07:00
Chris Robinson
e8ff304562 Fix the initial normal vector for vertex fixups 2012-07-18 12:53:45 -07:00
Chris Robinson
3b29d280b9 Filter out skinned shapes that don't match the bone name 2012-07-18 12:47:16 -07:00
Chris Robinson
db948969c9 Attach NPC parts to the proper bone 2012-07-18 11:14:13 -07:00
Chris Robinson
04e496a6ca Store the entity lists for NPC parts 2012-07-18 10:26:25 -07:00
Chris Robinson
6611b0b317 Use an array instead of a bunch of nearly-identical if blocks 2012-07-18 10:09:16 -07:00
Chris Robinson
02d39080c8 Destroy entities when they're done with. 2012-07-18 00:17:39 -07:00
Chris Robinson
4109d0d923 Destroy entities removed from the NPC 2012-07-17 22:47:56 -07:00
Chris Robinson
a32740cf5e Remove an unused parameter 2012-07-17 22:41:26 -07:00
Chris Robinson
b04c3cbcac Store the entities' root node in the EntityList 2012-07-17 21:42:47 -07:00
Chris Robinson
92546ca18d Move the last bits of code to createEntities 2012-07-17 20:23:09 -07:00
Chris Robinson
1c544682d5 Stub handling for NiTextKeyExtraData to suppress some spam 2012-07-17 16:45:01 -07:00
Chris Robinson
496343b714 Use the proper member for the NIF type string 2012-07-17 16:36:43 -07:00
Chris Robinson
94f3e7a6c0 Store the entity list in the object 2012-07-17 16:00:03 -07:00
Chris Robinson
a590db2cf4 Create entities when loading NIFs for the NPC base 2012-07-17 15:43:40 -07:00
Chris Robinson
3efd2030e2 Create entities when loading NIFs for creatures 2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1 Create mesh entities for objects when loading the NIF 2012-07-17 13:40:03 -07:00
Chris Robinson
c6cc82a51a Handle multiple entities per NPC part 2012-07-17 12:20:52 -07:00
Chris Robinson
89cfe778f0 Support multiple entities for the NPC base 2012-07-17 11:38:50 -07:00
Chris Robinson
0a4a141f2e Support multiple meshes for creatures 2012-07-17 11:23:34 -07: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
Chris Robinson
93f0043afc Set the mesh's attach point as the NiTriShape's node 2012-07-17 10:04:21 -07:00
Marc Zinnschlag
483b125aad avoid locking up in case actor updates repeatedly throw exceptions 2012-07-17 18:37:20 +02:00
Marc Zinnschlag
6744375636 fixed a logic error in the auto equip code 2012-07-17 18:35:01 +02:00
Marc Zinnschlag
beb18282bb Issue #342: various fixes 2012-07-17 16:44:55 +02:00
Marc Zinnschlag
76de2f7360 Issue #342: handle magic effects 79-82 and 17-20 2012-07-17 15:49:37 +02:00
Marc Zinnschlag
a3652f16ce Issue #342: factored out dynamic stats calculation into a separate function 2012-07-17 12:18:43 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
Marc Zinnschlag
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +02:00
Marc Zinnschlag
47ec8f68ee Merge branch 'fix' 2012-07-17 09:50:23 +02:00
Marc Zinnschlag
e9b95d55cd Revert "Proper way to find and use libtbb"
This reverts commit d6bf2b7d29.
2012-07-17 09:49:52 +02: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
65c20f128f Build bones for non-NiNode nodes (NiTriShapes, etc) 2012-07-16 21:18:33 -07:00
Chris Robinson
ada88596dc Fix an abort at shutdown
Ogre uses a special method to delete the stream object, so it needs to be
allocated properly.
2012-07-16 15:30:09 -07:00
Chris Robinson
fefbf86531 Use Ogre's matrix ops to transform normals 2012-07-16 14:30:23 -07:00
Chris Robinson
bf26f029f9 Fix some skinning-related transformations 2012-07-16 13:47:19 -07:00
Chris Robinson
df76c324a4 Handle the MRK text string marker 2012-07-16 13:34:56 -07:00
Chris Robinson
63e40d6e92 Fix world transform calculation 2012-07-16 13:16:11 -07:00
Dmitry Marakasov
d6bf2b7d29 Proper way to find and use libtbb 2012-07-17 00:11:56 +04:00
Dmitry Marakasov
0e934a52ca Include soundmanager.hpp for Play_Normal enum 2012-07-16 23:54:24 +04:00
Dmitry Marakasov
1c53add6c4 Include boost/shared_ptr.hpp for boost:shared_ptr 2012-07-16 23:54:21 +04:00
Chris Robinson
12f1785882 Use default bone names for duplicate names 2012-07-16 11:43:16 -07:00
Chris Robinson
75ce10c580 Don't load data for hidden meshes 2012-07-16 11:31:45 -07:00
Chris Robinson
a539e98274 Handle all meshes when inserting objects into the scene 2012-07-16 10:48:48 -07:00
Dmitry Marakasov
e862b6b5a5 Fix comparison in cmake 2012-07-16 15:53:02 +04:00
Chris Robinson
ad75b47472 Build and set up a skeleton for meshes 2012-07-15 19:07:31 -07:00
Chris Robinson
b1f7fd9f7b Pre-transform the mesh vertices when there's no skinning or skeleton 2012-07-15 17:00:27 -07:00
Chris Robinson
61f32eca77 Add methods to get a node's local and full transform as a 4x4 matrix 2012-07-15 15:23:49 -07:00