Merge remote-tracking branch 'origin/openmw-37' into openmw-37

apps/openmw/mwphysics/physicssystem.cpp

@@ -1062,9 +1062,9 @@ namespace MWPhysics
     void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
-        float scale = ptr.getCellRef().getScale();
         if (found != mObjects.end())
         {
+            float scale = ptr.getCellRef().getScale();
             found->second->setScale(scale);
             mCollisionWorld->updateSingleAabb(found->second->getCollisionObject());
             return;

apps/openmw/mwrender/objects.cpp

@@ -125,6 +125,11 @@ void Objects::insertBegin(const MWWorld::Ptr& ptr)
 
     insert->setPosition(osg::Vec3(f[0], f[1], f[2]));
 
+    const float scale = ptr.getCellRef().getScale();
+    osg::Vec3f scaleVec(scale, scale, scale);
+    ptr.getClass().adjustScale(ptr, scaleVec, true);
+    insert->setScale(scaleVec);
+
     ptr.getRefData().setBaseNode(insert);
 }
 

apps/openmw/mwsound/soundmanagerimp.cpp

@@ -168,8 +168,8 @@ namespace MWSound
         SoundMap::const_iterator snditer = mActiveSounds.begin();
         while(snditer != mActiveSounds.end())
         {
-            if(snditer->second.first == ptr && snditer->second.second == id)
+            if(snditer->second.first == ptr && snditer->second.second == id && snditer->first->isPlaying())
-                return snditer->first->isPlaying();
+                return true;
             ++snditer;
         }
         return false;

apps/openmw/mwworld/scene.cpp

@@ -73,6 +73,8 @@ namespace
             osg::Vec3f scaleVec (scale, scale, scale);
             ptr.getClass().adjustScale(ptr, scaleVec, true);
             rendering.scaleObject(ptr, scaleVec);
+
+            physics.updateScale(ptr);
         }
     }
 
@@ -114,7 +116,6 @@ namespace
             {
                 addObject(ptr, mPhysics, mRendering);
                 updateObjectRotation(ptr, mPhysics, mRendering, false);
-                updateObjectScale(ptr, mPhysics, mRendering);
                 ptr.getClass().adjustPosition (ptr, false);
             }
             catch (const std::exception& e)

apps/openmw/mwworld/weather.cpp

@@ -680,7 +680,7 @@ void WeatherManager::update(float duration, bool paused)
         if ( !is_night ) {
             theta = M_PI * (adjustedHour - mSunriseTime) / dayDuration;
         } else {
-            theta = M_PI * (adjustedHour - adjustedNightStart) / nightDuration;
+            theta = M_PI * (1.f - (adjustedHour - adjustedNightStart) / nightDuration);
         }
 
         osg::Vec3f final(

components/nifosg/nifloader.cpp

@@ -843,6 +843,8 @@ namespace NifOsg
                 partsys->getOrCreateUserDataContainer()->addDescription("worldspace");
             }
 
+            partsys->setParticleScaleReferenceFrame(osgParticle::ParticleSystem::LOCAL_COORDINATES);
+
             handleParticleInitialState(nifNode, partsys, partctrl);
 
             partsys->setQuota(partctrl->numParticles);