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
|
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
|
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
|
4bfed952bc
|
Merge remote branch 'guidoj/master'
|
2012-07-17 10:17:06 +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 |
|
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
|
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 |
|
Chris Robinson
|
441a5c2da2
|
Load NiTriShapes into Ogre meshes
|
2012-07-15 14:12:12 -07:00 |
|
Chris Robinson
|
3029c221ef
|
Create materials when creating meshes
|
2012-07-15 12:59:39 -07:00 |
|
scrawl
|
fb1f8082d2
|
fix link error with recent glibc versions
|
2012-07-15 21:27:57 +02:00 |
|
Chris Robinson
|
b4c8375f3c
|
Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
components/bsa/bsa_archive.cpp
|
2012-07-15 12:04:43 -07:00 |
|
Chris Robinson
|
9028cfe83c
|
Look for the NiTriShape when the mesh resource wants to load
It's still not loaded yet.
|
2012-07-15 12:02:47 -07:00 |
|
Chris Robinson
|
69ed73399a
|
Avoid exposing the NIF mesh resource loading class
|
2012-07-15 11:40:48 -07:00 |
|
Chris Robinson
|
300730a834
|
Create the skeleton resource from NIFs
Note they are not loaded yet.
|
2012-07-15 11:13:48 -07:00 |
|
Marc Zinnschlag
|
871b1d1c9b
|
silenced a warning
|
2012-07-15 19:20:59 +02:00 |
|
Chris Robinson
|
bc0a6bffcf
|
Remove outdated comment
|
2012-07-15 09:03:35 -07:00 |
|
Chris Robinson
|
bd68f7bd33
|
Remove final direct uses of Mangle::Stream
|
2012-07-15 08:51:51 -07:00 |
|
Chris Robinson
|
7734771245
|
Use Ogre to load ESM data instead of Mangle
|
2012-07-15 08:31:03 -07:00 |
|
Chris Robinson
|
a8ebb39883
|
Avoid Mangle for BSA accesses
The way it was set up was not very efficient, and we're using Ogre for resource
management anyway, so it's best to just use that.
|
2012-07-15 07:50:24 -07:00 |
|
Chris Robinson
|
6a447c88fb
|
Create meshes from the NiTriShapes in the NIF.
This doesn't actually load them yet. It's also very slow for certain NIFs.
|
2012-07-15 06:45:21 -07:00 |
|
Chris Robinson
|
9caa264074
|
Merge remote branch 'zini/master' into nif-cleanup
|
2012-07-14 17:27:36 -07:00 |
|
scrawl
|
5345d4eeef
|
fix a warning
|
2012-07-14 18:45:03 +02:00 |
|
Chris Robinson
|
5a381006e5
|
Fix parsing of some key lists
It seems some still want you to read the interpolation type even when there's
no keys.
|
2012-07-14 09:20:09 -07:00 |
|
Chris Robinson
|
939d0d2fc5
|
Return a list of meshes and the skeleton from NIFLoader::load
|
2012-07-13 20:01:15 -07:00 |
|
Chris Robinson
|
fdfe40a55a
|
Use a different loader object for each NIF mesh
|
2012-07-13 13:41:08 -07:00 |
|
Chris Robinson
|
9436ca4b0c
|
Use vectors for ShapeData properties
|
2012-07-13 09:32:58 -07:00 |
|
Marc Zinnschlag
|
182017b8e9
|
Issue #314: Moved ingredients and potions to a different type of record list
|
2012-07-13 13:08:48 +02:00 |
|
Chris Robinson
|
ecdd4ee23f
|
Load NiMorphData and NiKeyframeData using proper key lists
|
2012-07-12 20:56:47 -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
|
9995dff943
|
Use a key list for NiColorData
|
2012-07-12 14:33:50 -07:00 |
|
Chris Robinson
|
3f11b6b1ae
|
Cleanup a couple unneeded misc component references
|
2012-07-12 12:01:11 -07:00 |
|
Chris Robinson
|
86b37c6c11
|
Move the velocity out of the transformation object
|
2012-07-12 11:21:52 -07:00 |
|
Chris Robinson
|
b292665de9
|
Use key lists to store some NIF data types
|
2012-07-12 08:00:26 -07:00 |
|
Chris Robinson
|
b7b9f11333
|
Add generic classes to help deal with NIF keys
|
2012-07-12 06:47:38 -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
|
7e8c146de6
|
Constify some RecordListT methods
|
2012-07-11 06:39:03 -07:00 |
|
Chris Robinson
|
8e324c90dc
|
Constify some RecordPtrT methods
|
2012-07-11 06:37:17 -07:00 |
|
Chris Robinson
|
395a7600fd
|
Initialize identify transform when declaring the identity object
|
2012-07-10 23:13:03 -07:00 |
|