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
Chris Robinson
3970407772
Use actual classes for properties
2013-04-10 20:22:13 -07:00
Chris Robinson
caff28e20a
Move NIFSkeletonLoader to a separate file
2013-04-10 19:58:17 -07:00
Marc Zinnschlag
74145410f2
basic syntax highlighting in script subview
2013-04-10 22:49:22 +02:00
Chris Robinson
6c6750342c
Specified particle size is actually the radius
2013-04-10 13:37:20 -07:00
Chris Robinson
9d29921913
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-09 15:12:19 -07:00
Marc Zinnschlag
ec6dff38b1
added basic spell table
2013-04-09 11:40:36 +02:00
Chris Robinson
973fdeb2e0
Improve particle system placement when no emitters are specified
2013-04-08 15:21:28 -07:00
Chris Robinson
e7c0f2a211
Minor cleanup to loading texture UV coords
2013-04-08 14:54:13 -07:00
Chris Robinson
01a1a0b846
Merge remote-tracking branch 'zini/master' into nifogre
...
Conflicts:
components/nifogre/ogrenifloader.cpp
2013-04-08 11:46:57 -07:00
Marc Zinnschlag
85e5bd212b
Merge remote-tracking branch 'scrawl/master'
2013-04-08 20:05:52 +02:00
Chris Robinson
23097ac9dc
Minor cleanup of NiMorphData
2013-04-08 09:47:03 -07:00
scrawl
343e2027af
Support NIF detail maps
2013-04-08 15:17:30 +02:00
scrawl
a5c868c9f5
Create a separate vertex buffer for each UV set
2013-04-08 14:54:19 +02:00
Chris Robinson
c6c67a1bb4
Read NiGravity fields
2013-04-07 18:15:23 -07:00
Chris Robinson
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-07 17:24:47 -07:00
Chris Robinson
dba7308248
Recognize NiParticleRotation
2013-04-07 17:16:49 -07:00
Chris Robinson
3c633e275e
Don't create a controller for empty keyframe data
2013-04-07 15:42:07 -07:00
Chris Robinson
261ea1fe5e
Implement a KeyframeController
2013-04-07 14:56:23 -07:00
Chris Robinson
f69a8259e1
Update animation source controller targets
2013-04-07 13:51:04 -07:00
Chris Robinson
44a59e1b87
Fix a couple messages
2013-04-07 13:03:41 -07:00
Chris Robinson
2362e920f3
Use an unconnected object list for animation sources
...
We'll want the controllers, as the plan is to use their keyframe controllers
to animate the actual skeleton used for the meshes.
2013-04-07 12:41:27 -07:00
scrawl
f3c8cd2065
Don't buy/sell keys which are set to open a lock
2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6
Implemented levelled items
2013-04-07 21:01:02 +02:00
Marc Zinnschlag
60cc95305d
added basic birthsign table
2013-04-07 20:26:39 +02:00
Chris Robinson
399394ff10
Don't restrict animations to the keyframe time limits
2013-04-07 10:03:13 -07:00
Chris Robinson
ab5980ae18
Let the default controller function use absolute input
...
And convert the VisController to use it.
2013-04-07 08:29:56 -07:00
Chris Robinson
fe9a7f12b6
Material fixes
2013-04-07 07:53:01 -07:00
Marc Zinnschlag
e25f5c6dfe
added basic region table
2013-04-07 16:32:06 +02:00
Chris Robinson
2e067e95a9
Handle NiWireframeProperty
2013-04-07 07:12:52 -07:00
Chris Robinson
ebff64a7a4
Fix UVController and add warn about unhandled material controllers
2013-04-07 06:56:12 -07:00
Marc Zinnschlag
ff1d908af4
added script table
2013-04-07 15:17:35 +02:00
Chris Robinson
be419bc891
Handle NiCamera nodes
2013-04-07 02:28:15 -07:00
Chris Robinson
2db72ae607
Rename EntityList to ObjectList
2013-04-07 01:52:35 -07:00
Chris Robinson
834a6a1f00
Remove old, unused code
2013-04-07 01:14:26 -07:00
Chris Robinson
d97b341dc6
Rename NIFMeshLoader to NIFObjectLoader
2013-04-07 01:02:21 -07:00
Marc Zinnschlag
ec7a8f1add
small fix
2013-04-06 21:58:28 +02:00
Chris Robinson
63cbf7ddeb
Specify a default return for failed lookups
2013-04-06 12:41:40 -07:00
Chris Robinson
ca289a317c
Separate the UVController function out and make it generic
...
Also fix a timing bug in it.
2013-04-06 12:26:58 -07:00
Marc Zinnschlag
8bf569d58a
added basic sound table
2013-04-06 21:21:10 +02:00
Chris Robinson
6b151be3f4
Create particle systems even when MRK was specified
2013-04-06 11:26:51 -07:00
Chris Robinson
41e410347e
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-06 10:35:01 -07:00
Chris Robinson
c283991126
Remove an unneeded method
2013-04-06 10:33:07 -07:00
Marc Zinnschlag
0f34c79d0a
Merge branch 'race'
2013-04-06 19:21:38 +02:00
Chris Robinson
ebcb4c66c3
Properly read and use the NIF root record list
2013-04-06 10:17:09 -07:00
Chris Robinson
59f1d4b047
Add support for NiUVController on meshes
2013-04-06 09:44:10 -07:00
Chris Robinson
e0da265972
Use accurate bone lookups for attaching objects
...
NIFs don't requires nodes to have unique names, which means looking up a
bone by name may get the wrong one. Instead, use a NifIndex:BoneHandle
map to make sure we can get the proper bone from a given Nif::Node.
2013-04-06 08:15:12 -07:00
Chris Robinson
95730cc127
Create entities and particle systems for hidden objects
...
They're set as (in)visible as appropriate.
2013-04-06 06:53:08 -07:00
Chris Robinson
f764f243d2
Fix the particle quota
2013-04-06 06:44:34 -07:00
Chris Robinson
41ce5464c9
Recognize NiBSAnimationNode as a record type
...
And don't warn about animated nodes without textkeys
2013-04-06 05:00:19 -07:00
Chris Robinson
99b915e652
Fix some material warnings
2013-04-06 00:54:53 -07:00
Chris Robinson
af756bfa9c
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-06 00:22:31 -07:00
Chris Robinson
b5017e0543
Implement NiParticleGrowFade
2013-04-06 00:19:05 -07:00
Chris Robinson
aa9df818a5
Add support for NiVisController
2013-04-05 10:38:27 -07:00
Chris Robinson
0631b28646
Prepare for supporting controller objects
2013-04-05 10:13:54 -07:00
scrawl
75b462b974
If alpha rejection was forced, we also need to force depth_write and depth_check
2013-04-05 18:24:12 +02:00
Chris Robinson
bf0ae3ae72
Read NiVisData info
2013-04-05 06:29:14 -07:00
Chris Robinson
12fada2862
Don't offset the animation time to 0
2013-04-05 05:34:59 -07:00
Chris Robinson
dc9f5f93e7
Use a helper function to get node properties
2013-04-05 05:14:24 -07:00
Marc Zinnschlag
73da794d77
added basic race table
2013-04-04 14:34:39 +02:00
Chris Robinson
b5719e0ec7
Create particle systems for NiAutoNormalParticles and NiRotatingParticles nodes
...
Very incomplete, but it's something to work with.
2013-04-04 05:10:53 -07:00
Chris Robinson
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
2013-04-04 05:10:52 -07:00
Chris Robinson
ac10c5f05c
Even more particle information
2013-04-04 05:10:52 -07:00
Chris Robinson
2f6ae4a915
Read more particle information
2013-04-04 05:10:51 -07:00
Chris Robinson
ee0a20f9ce
Read some missing particle data from NIFs
2013-04-04 05:10:50 -07:00
Chris Robinson
97d617d43f
Use more appropriate VBO settings
...
Unskinned meshes don't need dynamic VBOs; they aren't rewritten since their
transformations are handled by the modelview matrix. They also don't need the
local RAM copy (the "shadow buffer") since it's really only useful for skinning
purposes (though this means the VBO has to be readable for static geometry to
work).
2013-04-04 05:10:49 -07:00
Marc Zinnschlag
18e046e628
cleaned up race record struct
2013-04-04 13:50:36 +02:00
Marc Zinnschlag
8c7d578ddc
moved the CellRef struct to its own header
2013-04-04 12:13:15 +02:00
Marc Zinnschlag
7136ac0079
added missing attribute columns to faction table
2013-04-04 10:58:53 +02:00
scrawl
a9b56eedc3
Support NIF "glow maps", which are basically an emissive channel.
2013-04-03 18:51:40 +02:00
scrawl
5625d73d84
Bump texture support
2013-04-03 17:16:34 +02:00
Chris Robinson
095daca058
Create entities when iterating through the NIF
2013-04-03 03:27:41 -07:00
Chris Robinson
512534be11
Read the correct texture resource for other layers
2013-04-02 22:58:07 -07:00
Chris Robinson
f6f165852d
Better handle material texture layers
2013-04-02 21:09:44 -07:00
Marc Zinnschlag
384c88182d
dealing with unset attribute fields
2013-04-02 14:15:22 +02:00
Marc Zinnschlag
f9f520df34
adjusted faction record to increase consistency with other records
2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d
added faction table
2013-04-02 12:00:45 +02:00
Marc Zinnschlag
fd0aa1a4b8
Issue #685 : Treat : as a whitespace
2013-03-31 14:46:46 +02:00
Marc Zinnschlag
607435aaf2
Merge branch 'class'
2013-03-31 10:49:56 +02:00
scrawl
e27e53f607
Fix not playable body parts appearing in the race selection menu.
2013-03-30 20:04:05 +01:00
scrawl
6f1575d42a
CELL record corrections
2013-03-27 17:27:43 +01:00
Marc Zinnschlag
ea3b14f2d2
added skill columns to class
2013-03-26 09:43:13 +01:00
Marc Zinnschlag
c7275965b8
added basic class record table
2013-03-25 13:22:06 +01:00
Marc Zinnschlag
1078386fd7
Merge branch 'skills' into next
2013-03-25 11:07:14 +01:00
Marc Zinnschlag
114f99ddbf
add skill records when creating a new base file
2013-03-24 15:10:03 +01:00
scrawl
8e2f9f5186
Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips
2013-03-22 12:24:09 +01:00
scrawl
918cdcffc2
Split up components/esm/loadlocks
2013-03-22 05:50:54 +01:00
Marc Zinnschlag
7df0f6aaee
prepared skill record for use in editor
2013-03-21 14:30:27 +01:00
Marc Zinnschlag
1d1471b81c
fixed a bug in ESM::Variant::write (was affecting string values)
2013-03-21 12:57:10 +01:00
scrawl
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
2013-03-20 02:29:03 +01:00
Marc Zinnschlag
4711135e7f
workaround for faulty endif in Morrowind scripts
2013-03-18 12:05:54 +01:00
Marc Zinnschlag
6ef754c451
Merge remote-tracking branch 'scrawl/armorrating' into next
2013-03-18 07:53:20 +01:00
Marc Zinnschlag
46bde604f9
Issue #601 : unary minus was interpreted as binary minus when used in an argument list without comma
2013-03-17 17:13:25 +01:00
scrawl
dd57eabc3e
Better use an enum for magic effect IDs
2013-03-16 23:28:26 +01: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
Marc Zinnschlag
1a809b1cec
Merge remote-tracking branch 'scrawl/master'
2013-03-13 08:32:44 +01:00
scrawl
599207a92d
Transparency sorting should be enabled only when alpha blending is enabled
2013-03-13 01:00:47 +01:00
Marc Zinnschlag
170451cb79
Merge remote-tracking branch 'graffy76/saveOnClose' into next
2013-03-12 14:47:42 +01:00
Marc Zinnschlag
75bd30844d
added optional format sub-record to tes3 record
2013-03-12 14:33:35 +01:00
graffy76
50abb22162
Fix to allow application closing from multiple views and a single view.
2013-03-12 06:28:13 -05:00
Marc Zinnschlag
16570ce87b
moved header record struct to separate file
2013-03-12 09:16:03 +01:00
Marc Zinnschlag
731ac6a160
removed redundant copy of Header::Data
2013-03-12 08:30:51 +01:00
Marc Zinnschlag
9e68a420ae
restructuring tes3 record structs
2013-03-12 08:15:20 +01:00
pvdk
b2d522aa4d
Added support for non-latin characters in esx metadata
2013-03-12 04:01:05 +01:00
Marc Zinnschlag
b085c4f749
removing more leftovers
2013-03-11 16:53:42 +01:00
Marc Zinnschlag
2e1a1fd11a
removing some remains of the removed GMST fixing feature
2013-03-11 16:30:47 +01:00
Marc Zinnschlag
64d517dd79
removed unused file type information from esm component
2013-03-11 14:42:49 +01:00
Emanuel Guevel
289bbc64f7
Load fallback archives listed in openmw.cfg at startup
2013-03-09 21:14:11 +01:00
Marc Zinnschlag
b255472cc6
fixed a spelling mistake
2013-03-09 15:39:49 +01:00
Marc Zinnschlag
2cc20c67cb
Merge remote-tracking branch 'scrawl/raycasting'
2013-03-09 14:34:29 +01:00
scrawl
14964e9fcd
Only build a box shape for collision nodes; use StringUtils
2013-03-09 10:28:10 +01:00
