Commit Graph

246 Commits (828c52138fa8fd6a8c91fdb0205013dfb5b51511)

Author SHA1 Message Date
scrawl 64424e7262 Move keyframe loading out of SceneManager to new KeyframeManager 9 years ago
scrawl e3d3380c8c Remove return value for in-place toLowerStr 9 years ago
scrawl 1d5af3c9c8 Remove unneeded cast 9 years ago
scrawl e39f49a88f OSG extensions namespace fixes 9 years ago
scrawl a29aef14f1 Eliminate a dynamic_cast in ParticleSystemController 9 years ago
scrawl 6cf2c35235 Don't rely on the _particles vector implementation details
This will allow compiling OpenMW with an osgParticle optimization to be pushed to OpenMW/osg.
9 years ago
scrawl c9d710f334 Use a typedef to avoid conditional compiling 9 years ago
Alexander "Ace" Olofsson cfcbd20d99 Let's put it as a MSVC-only fix for now 9 years ago
Alexander "Ace" Olofsson e42f4999bd Quick fix for building on MSVC 9 years ago
scrawl e5ec4fe042 Add const specifier 9 years ago
scrawl 695fcf41c4 Optimize ValueInterpolator / KeyframeController
Cache the current position in the animation track and attempt to reuse it in the next frame.

Decent speed up for the Update phase, about 0.3 ms faster in Balmora.
9 years ago
scrawl ac366f1603 Fix the rig bounds being updated twice per frame
Unlike what I expected, the osgUtil::UpdateVisitor is set to traverse all children (not only active children). The FrameSwitch was thus traversing both RigGeometries part of the double-buffering scheme, rather than only the one active in the current frame.
9 years ago
scrawl 38510a56c2 GeomMorpherController: do not dirty the MorphGeometry unless necessary 9 years ago
scrawl 0d49c7fa51 GeomMorpherController: fix double update of MorphGeometry 9 years ago
scrawl 28b20428b9 Remove dynamic_cast in GeomMorpherController 9 years ago
scrawl fc7456e0a1 Explicitely opt for float matrices in performance critical places 9 years ago
scrawl 36e91617c9 Revert "NifOsg::Emitter: ignore psToWorld scale"
This reverts commit 7c16630874.

Fixes #3022
9 years ago
scrawl 9b96fcc224 Set the particle scaleReferenceFrame to local space 9 years ago
scrawl 21e25f4756 Use the traversalNumber as frame number 9 years ago
scrawl 7c16630874 NifOsg::Emitter: ignore psToWorld scale
Seems wrong to me, but MW appears to do it that way. Without this fix, the light_de_candle_08_64 from http://www.nexusmods.com/morrowind/mods/41654/ has flame particles in the wrong spot.
9 years ago
scrawl 0965a9059d Handle NiLODNode using osg::LOD (Fixes #3008) 9 years ago
scrawl 1edcb219a7 Leak fix 9 years ago
scrawl fc93dc6195 Remove a stray method declaration 9 years ago
scrawl 0409e5a043 Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change) 9 years ago
scrawl f1ac408f35 Place Drawables directly in the scene graph when built with OSG 3.4
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.

There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
9 years ago
scrawl bd8332d2b0 Remove default copyop argument for nodecallback copy constructors
Works around a compiler warning with OSG 3.4:

warning: base class 'class osg::Callback' should be explicitly initialized in the copy constructor [-Wextra]

With no default argument for osg::CopyOp&, the compiler no longer sees the function as a real copy constructor and stops warning about the missing virtual initializations.

We don't care about this warning because there is nothing interesting to initialize in the osg::NodeCallback base anyway.

A proper fix for the warning would require to inserting OSG_VERSION conditional compiling all over the place, that is as long as we are still supporting OSG 3.2.
9 years ago
scrawl 64abdbabe3 Small refactor of controllers handling, print warning messages for unhandled controllers 9 years ago
scrawl 35f5be680b Support for NiVisController on trishape nodes 9 years ago
scrawl 2ee6b41887 Handle NiAlphaProperty on a drawable basis
Removes the RenderBin nesting complication. Also results in leaner StateSets, so the cull phase should be a bit faster.
9 years ago
scrawl 8e69c80bf6 Add framenumber checks in various cull callbacks, so we don't update more than once per frame when multiple cameras are used 9 years ago
scrawl 76fb68a9c0 Handle particle systems that don't have emitters
Fixes a crash in the Magic Diversity mod.
9 years ago
scrawl 16b8ef3164 Don't use a shared Material in MaterialColorController 10 years ago
scrawl de479e35c8 Fix AlphaController affecting all instances of the StateSet 10 years ago
Arthur Moore 2d93a6f6cb Be more verbose when dealing with unhandled nif texture properties 10 years ago
scrawl ac1f64b559 Fix StencilProperty front face mixup (Fixes #2802) 10 years ago
scrawl 24ae1d5ace Fix some issues found by coverity 10 years ago
scrawl bf9c62fa42 Fix for some coverity scan defects 10 years ago
scrawl 7a5f220ac5 GlowTexture keeps the alpha channel from the previous texture stage 10 years ago
scrawl 39539603bf Re-enable a warning message 10 years ago
scrawl a7c5beb7c5 Remove redundant allocations for NIF meshes 10 years ago
scrawl 81a4a6da6b Make better use of the available texture units (Bug #2702)
Nvidia drivers only support a maximum of 4 fixed function texture units. To resolve this problem, bind texture units in order instead of binding to the NiTexturingProperty::TextureType unit.
10 years ago
scrawl 934166a853 Ignore the alpha value for particle materials (Bug #2699) 10 years ago
scrawl d7a4a9fd66 Create NIF root nodes as Group instead of Transform when possible 10 years ago
scrawl b79ab1a3b8 Fix InverseWorldMatrix bug introduced by last commit 10 years ago
scrawl ec25f1da95 Fix ParticleSystem bug introduced by last commit 10 years ago
scrawl ad46ff7a98 Remove redundant Transform nodes for TriShapes/ParticleSystems with an identity transform 10 years ago
scrawl ab597f672e State the filename in NIF loader warning messages 10 years ago
scrawl 6a788c3462 Minor cleanup 10 years ago
scrawl a5b72a358b Prune empty nodes in RemoveDrawableVisitor
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
10 years ago
scrawl 9e049894e8 Reduce the number of StateSets created for NIF scene graphs
The Material state is now set on the NiTriShape's node rather than the Geode, thus merged with other state like NiTexturingProperties, etc that are typically attached to the NiTriShape.

Effectively cuts in half the number of StatSets for a NIF file, resulting in big speedup (~10%) in the Cull and Draw phases.
10 years ago
scrawl 8d6620b074 Assign an initial bounding box to particle systems 10 years ago
scrawl b5099324d1 Enable ParticleSystem's FreezeOnCull, big speed-up in Vivec 10 years ago
scrawl 93ee11c5e7 Fix particlesystem nested RenderBin issue (Bug #2631) 10 years ago
scrawl 347c9b57b8 Copy constructor signature fix 10 years ago
scrawl 5edf457ab7 Build fix 10 years ago
scrawl 0a411cbd7c Enable particle lighting 10 years ago
scrawl d8d43f94b9 Fix a typo 10 years ago
scrawl 01944c33f5 Basic water rendering 10 years ago
scrawl 0f8f19958a NifLoader: Fix empty StateSets being created in some cases 10 years ago
scrawl 261ed1f4e5 Revert "Enable culling for particle emitters & programs"
This reverts commit 8b206e0aed.
10 years ago
scrawl 3dcb167066 Map rendering 10 years ago
scrawl da24e298ee Fix -Wreorder warnings 10 years ago
scrawl 604580d75d Move toMatrix to Nif::Node 10 years ago
scrawl 63b69db617 Port skeleton based bounding boxes to the new skinning system
Not sure if going to keep this, there's a noticable performance impact.
10 years ago
scrawl 372a54bbc7 Dead code removal 10 years ago
scrawl 09742d5b95 Animation playback works, no movement accumulation yet 10 years ago
scrawl cd7808fc11 Cleanup in preparation for animation port
Scrapped previous idea for multiple animation sources, better approach incoming.
10 years ago
scrawl 148c041a43 Nif loader cleanup - forcing a skeleton is no longer needed 10 years ago
scrawl 1a19cd3607 Some cleanup 10 years ago
scrawl 28643660d3 Change triangle indices to unsigned 10 years ago
scrawl 10644544ab Dead code removal 10 years ago
scrawl eaa4316ff8 Move skinning code to SceneUtil 10 years ago
scrawl 9246a668b9 Skeleton update fix 10 years ago
scrawl bd88758962 Use the new skinning system in OpenMW 10 years ago
scrawl 111e3eb6db Slightly improve bounding box for skinned meshes 10 years ago
scrawl 4ea6d4aa01 Rewrite of skinning code
Goals:
- get rid of the mesh pre-transform (this requires supporting different bind matrices for each mesh)
- bounding box should be relative to the bone the mesh is attached to, ideally we can then get rid of the expensive skeleton-based bounding boxes
- update bone matrices in CullCallback instead of UpdateCallback

Works OK, though the bounding boxes are not correct yet.
10 years ago
scrawl 167ae600c5 Implement gravity decay (previously unknown float) 10 years ago
scrawl edc5cad79e Port Animation::addEffect 10 years ago
scrawl c334a76a6f Fix skinning bug 10 years ago
scrawl f7da979669 Add FrameSwitch (geometry "double buffering") for efficient updates of RigGeometry & MorphGeometry 10 years ago
scrawl c516e897ee Move Controller base classes to SceneUtil, add visitor to assign ControllerSources 10 years ago
scrawl de2c85e0f8 Port nifloader to the more efficient StateSetController 10 years ago
scrawl a0b43f426e Avoid setting DYNAMIC DataVariance on StateSets 10 years ago
scrawl 591a35b8d7 *very* early version of the LightManager 10 years ago
scrawl 433e29f297 MorphGeometry optimizations: static bounding box and vertices updated during cull traversal 10 years ago
scrawl 8b206e0aed Enable culling for particle emitters & programs
Big speedup, though might cause timing inconsistencies that we should fix at some point.
10 years ago
scrawl 0b77ae43a4 Minor optimization for particle emitters 10 years ago
scrawl 74c56556cc More fixes for scaled particle systems 10 years ago
scrawl 1eafecd30c Add magic factor as in vanilla MW to gravity affector (Bug #2147) 10 years ago
scrawl 304d7e544f Optimize RigGeometry to update skinning in CullCallback 10 years ago
scrawl e5e1013c51 TextKeys attached to root node as user data, add .kf loading to scenemanager 10 years ago
scrawl 31adaf2495 Use simulationTime instead of referenceTime 10 years ago
scrawl 12f27123f2 Billboard scaling fix and culling bug fix 10 years ago
scrawl 9975ec1678 Missing clone function 10 years ago
scrawl 6183926732 Particle fix 10 years ago
scrawl 173887c2d9 AlphaController copy fix 10 years ago
scrawl bb32c761df *very* early texture manager, need a lot more thought to design this properly 10 years ago
scrawl 322fcdc2d3 Transform world space particles when attaching to a node 10 years ago
scrawl 961aba5e2b Revert part of e91d9d0903 10 years ago
scrawl ac2612926e Disable unRefImageDataAfterApply 10 years ago
scrawl e91d9d0903 Fix for behaviour of scaled particle nodes
Not sure if used in vanilla assets so may be low priority, but couldn't help looking into this.
10 years ago
scrawl c10c146ad1 Skeleton based bounding box callback for RigGeometry (Bug #455) 10 years ago
scrawl 60f288195f Fix for copy construction of particle system templates 10 years ago
scrawl 99c9907ff3 Fix emitter/particlesystem scene graph order problems 10 years ago
scrawl caa93f767b Skip creating meshes for hidden nodes with no VisControllers
There's quite a bit of garbage in base_anim.nif, so this change should result in a much leaner scene graph.
10 years ago
scrawl e938fa4a9d Implement extrapolation mode in ControllerFunction (Bug #1871) 10 years ago
scrawl 96d51f0bb7 NiParticleRotation seems to be unused 10 years ago
scrawl 46cbec9a4a Add skinning auto-detection in nifosg loader 10 years ago
scrawl 60ede8dede Stop warning about NiFogProperty (unused in MW) 10 years ago
scrawl 6d9deaa386 Implement planar collider for particles (Fixes #2149) 10 years ago
scrawl c179977f20 Fix quaternion rotation order 10 years ago
scrawl 20866b44f7 FlipController fix, DetailTexture & DarkTexture tested 10 years ago
scrawl b072e803ce Use correct ambient/diffuse default values when no NiMaterialProperty exists 10 years ago
scrawl 9ee99a751c Stop warning about NiDitherProperty, ignore NiShadeProperty (unused) 10 years ago
scrawl 9141a8d801 Fully implement NiStencilProperty (Feature #1057) 10 years ago
scrawl baa152328a Crash fix 10 years ago
scrawl 376f0f3ac1 Small cleanup 10 years ago
scrawl 018115601a Move particle emitter/affector handling to separate functions 10 years ago
scrawl 36ad40827b Move parent node attachment out of nifloader 10 years ago
scrawl ff9e2b03a0 Hide NIF loader details in the implementation file 10 years ago
scrawl 5a582e7eb7 Reintroduce showMarkers flag 10 years ago
scrawl 6d85444d26 Add text key loading 10 years ago
scrawl 6219a7bbfc Add .kf loader 10 years ago
scrawl 9242e6d256 Avoid copying keyframes in controller instances 10 years ago
scrawl 2db5df77f0 Change rotation/scale workaround in preparation for loading .kf controllers 10 years ago
scrawl 15f9c1ddcf NiBSPArrayController works 10 years ago
scrawl 71782462b7 Subclass ParticleSystem to support limit on the number of particles 10 years ago
scrawl 2e11642273 Fix BillboardNode overriding scale 10 years ago
scrawl a9aee389c0 Emitters attached to correct node, a bit ugly 10 years ago
scrawl 32bb202290 Implement BillboardNode 10 years ago
scrawl d486cde330 Fix broken VisControllers 10 years ago
scrawl 4957ceeb1d Refactor controllers, now part of the scene graph as UpdateCallbacks
Practical benefits:
- The controller update is now run automatically
- Creating an instance of a scene graph should now work properly using the defined copy constructors
10 years ago
scrawl af27a10b0c OpenCS: preliminary port of PreviewWidget to OSG 10 years ago
scrawl ab3c28eb96 Use template function for interpolation 10 years ago
scrawl 00ab474188 More work on copy constructors 10 years ago
scrawl f8422c3ed4 Particles mostly completed, still need to attach emitters to the correct node and handle NiBSPArrayController 10 years ago
scrawl 79c2138e53 Port ResourceHelpers to new VFS 10 years ago
scrawl f843e12538 Add world space particle systems, will need more changes when emitters are added 10 years ago
scrawl 510375aa63 Add virtual file system (VFS) replacing the low level parts of the old resource system 10 years ago
scrawl 8d64f2081e Add particle system state loading 10 years ago
scrawl 2a92fb57f7 Add FlipController 10 years ago
scrawl 6c8613ae35 Add DarkTexture and DetailTexture 10 years ago
scrawl c54ee16748 Add AlphaController and MaterialColorController 10 years ago
scrawl 3839d6f777 Simplify controller classes 10 years ago
scrawl 74dfb23e7b Handle material properties in trishapeToGeometry 10 years ago
scrawl 8e01d8cb19 Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 10 years ago