Chris Robinson
15a2eeebb8
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca
Merge remote-tracking branch 'scrawl/master'
2013-04-29 18:08:25 +02:00
scrawl
d5c7a26041
Fix broken loose file resources when using Ogre 1.9
2013-04-29 12:32:24 +02:00
scrawl
78596cad83
Fix enchantment points value
2013-04-29 10:19:09 +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
Glorf
6ea82333d4
Headers cleanup
2013-04-28 16:38:33 +02:00
Glorf
98baf9fac1
Bugfix #718
2013-04-28 16:36:12 +02:00
Marc Zinnschlag
90b38cbfbe
fixed parsing of end statements in scripts with IDs matching keywords
2013-04-27 14:06:23 +02:00
Chris Robinson
68a9a4de5f
Fix setting and getting KeyframeController transforms
2013-04-24 04:12:27 -07:00
Chris Robinson
26cc86ffdc
Use the Nif node's transform for skinned fixups
2013-04-24 00:42:45 -07:00
Chris Robinson
6f0b9a5f2c
Avoid unnecessary multimap copies
2013-04-23 21:42:59 -07:00
Chris Robinson
512ff3687a
Don't create Ogre animations for skeletons
2013-04-23 20:42:54 -07:00
Chris Robinson
634b0fd067
Fix for controller delta time going below start time
2013-04-23 17:57:40 -07:00
Chris Robinson
020bc410bf
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-23 16:57:59 -07:00
scrawl
44ac0a7c18
Use one vertex buffer for all UV coordinates
2013-04-23 22:47:57 +02:00
Chris Robinson
adc6a948c7
Add methods to get the rotation, translation, and scale from a NodeTargetValue
2013-04-22 03:41:38 -07:00
Chris Robinson
59137d93c9
Partially handle NiGeomMorpherController
...
The morphs aren't actually applied yet, but the Ogre controller is set up so
all that has to be done is to implement the setValue method.
2013-04-22 03:24:02 -07:00
Chris Robinson
d936291dbf
Remove an unused ostream operator<<
2013-04-22 02:53:32 -07:00
Chris Robinson
a3511c62cf
Don't store textkeys in user object bindings
...
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.
Plus, proper serialization can help for future optimizations.
2013-04-22 00:01:30 -07:00
Chris Robinson
2345b5e8b3
Avoid storing text keys for each animation
2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6
Don't clip out the group name from the textkeys
2013-04-21 22:13:49 -07:00
Chris Robinson
ace7d647e5
Add a method to apply a NodeTargetValue-based controller to a specified node.
2013-04-20 15:35:19 -07:00
Chris Robinson
f37a71f025
Use a separate method to build node-based controllers
2013-04-19 23:56:47 -07:00
Chris Robinson
1051fa51a7
Recognize NiFlipController
2013-04-19 15:07:08 -07:00
Chris Robinson
6d59325bff
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-17 23:21:17 -07:00
scrawl
c519fc360d
Move away from fixed record names for body parts
2013-04-18 00:19:34 +02:00
Chris Robinson
3def2a0f45
Treat the particle random values as the max differential
2013-04-16 19:16:45 -07:00
Chris Robinson
cac793758b
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-16 11:52:19 -07:00
Chris Robinson
36170c5374
Use flag enums instead of hard-coded hex values
2013-04-16 01:20:32 -07:00
Chris Robinson
1b1f9f7921
Allow multiple ObjectLists to be created for Animations.
...
addObjectList may not currently be called outside of the related constructor.
2013-04-15 18:55:28 -07:00
Chris Robinson
7000a1aa3e
Add a ParticleSystemController
2013-04-14 13:50:55 -07:00
Chris Robinson
bf8bc989fc
Recognize and partly handle NiBSParticleNode
2013-04-14 12:52:20 -07:00
Marc Zinnschlag
f692fc1093
Merge branch 'cell'
2013-04-14 19:35:19 +02:00
Marc Zinnschlag
0c33dd86d5
added basic cell table
2013-04-14 17:04:55 +02:00
Chris Robinson
f4695ec4ac
Cleanup NIFObjectLoader some
2013-04-14 00:06:40 -07:00
Chris Robinson
acb1b5f002
Try to handle NiBSAnimationNode
...
This is still incomplete guess work. Currently it seems as though flag 0x20
specifies whether the controllers auto-play (if on), rather than follow the
object's animation time.
2013-04-13 22:54:32 -07:00
Chris Robinson
0b363ba36e
Handle NiParticleColorModifier with Ogre's ColourInterpolator
...
Note that Ogre's ColourInterpolator has a maximum of six color stages. This
seems to be fine so far, but if we want anything better, we'll need a custom
affector for it.
2013-04-13 16:42:32 -07:00
Chris Robinson
80a4345787
Keep particles in local space
2013-04-13 16:26:34 -07:00
Chris Robinson
dd981077b9
Handle the vertical and horizontal parameters of Nif particles
...
Note that 'horizontal' is mapped to rotate around the Z axis, not Y. The Nif
particle parameters seem to be set up to expect a normal OpenGL (Direct3D?)
orientation, rather than the 90-degree pitch offset of the game.
2013-04-13 16:16:57 -07:00
Chris Robinson
7191f6ed2a
Start a Nif-style particle emitter
...
Not complete yet (doesn't handle the vertical or horizontal direction/angle),
and should probably be renamed.
2013-04-13 14:36:24 -07:00
Chris Robinson
07c24e0382
Don't create entities and particles when only the skeleton base is needed
2013-04-13 13:13:09 -07:00
Chris Robinson
4a42f89e08
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-13 13:04:41 -07:00
Chris Robinson
5b30677e41
Add the start of a custom gravity affector
2013-04-12 14:39:06 -07:00
Marc Zinnschlag
a1ece7de30
Bug #613 : fixed assert in string literal access function
2013-04-12 14:48:53 +02:00
scrawl
23b477a938
Fix normal maps with spaces in filename not getting loaded
2013-04-12 04:36:28 +02:00
Marc Zinnschlag
5bfa691f14
Merge branch 'script'
2013-04-11 10:50:46 +02:00
Marc Zinnschlag
6d3a2cd5a0
added comment token (for use in syntax colouring)
2013-04-11 10:50:22 +02:00
Chris Robinson
d26ffe9de0
Move a method to the Node class
2013-04-10 23:19:47 -07:00
Chris Robinson
62e0abd945
Move the mesh loader to its own source file
2013-04-10 22:38:46 -07:00
Chris Robinson
75489b1e9d
Move NIFMaterialLoader to a separate file
2013-04-10 20:24:44 -07:00
