mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 20:06:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #414 from OpenMW/master

Browse source 
Add OpenMW commits up to 29 Apr 2018
This commit is contained in:
David Cernat 2018-04-29 22:35:05 +03:00 committed by GitHub
commit 273179fd5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwrender/characterpreview.cpp
View file

@ -1,5 +1,6 @@
#include "characterpreview.hpp" #include "characterpreview.hpp"
#include <cmath>
#include <iostream> #include <iostream>
#include <osg/Material> #include <osg/Material>
@ -13,6 +14,7 @@
#include <osgUtil/IntersectionVisitor> #include <osgUtil/IntersectionVisitor>
#include <osgUtil/LineSegmentIntersector> #include <osgUtil/LineSegmentIntersector>
#include <components/fallback/fallback.hpp>
#include <components/sceneutil/lightmanager.hpp> #include <components/sceneutil/lightmanager.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -158,14 +160,25 @@ namespace MWRender
stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE); stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel; osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
lightmodel->setAmbientIntensity(osg::Vec4(0.25, 0.25, 0.25, 1.0)); lightmodel->setAmbientIntensity(osg::Vec4(0.0, 0.0, 0.0, 1.0));
stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON); stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON);
/// \todo Read the fallback values from INIImporter (Inventory:Directional*) ?
osg::ref_ptr<osg::Light> light = new osg::Light; osg::ref_ptr<osg::Light> light = new osg::Light;
light->setPosition(osg::Vec4(-0.3,0.3,0.7, 0.0)); const Fallback::Map* fallback = MWBase::Environment::get().getWorld()->getFallback();
light->setDiffuse(osg::Vec4(1,1,1,1)); float diffuseR = fallback->getFallbackFloat("Inventory_DirectionalDiffuseR");
light->setAmbient(osg::Vec4(0,0,0,1)); float diffuseG = fallback->getFallbackFloat("Inventory_DirectionalDiffuseG");
float diffuseB = fallback->getFallbackFloat("Inventory_DirectionalDiffuseB");
float ambientR = fallback->getFallbackFloat("Inventory_DirectionalAmbientR");
float ambientG = fallback->getFallbackFloat("Inventory_DirectionalAmbientG");
float ambientB = fallback->getFallbackFloat("Inventory_DirectionalAmbientB");
float azimuth = osg::DegreesToRadians(180.f - fallback->getFallbackFloat("Inventory_DirectionalRotationX"));
float altitude = osg::DegreesToRadians(fallback->getFallbackFloat("Inventory_DirectionalRotationY"));
float positionX = std::cos(azimuth) * std::sin(altitude);
float positionY = std::sin(azimuth) * std::sin(altitude);
float positionZ = std::cos(altitude);
light->setPosition(osg::Vec4(positionX,positionY,positionZ, 0.0));
light->setDiffuse(osg::Vec4(diffuseR,diffuseG,diffuseB,1));
light->setAmbient(osg::Vec4(ambientR,ambientG,ambientB,1));
light->setSpecular(osg::Vec4(0,0,0,0)); light->setSpecular(osg::Vec4(0,0,0,0));
light->setLightNum(0); light->setLightNum(0);
light->setConstantAttenuation(1.f); light->setConstantAttenuation(1.f);

12
components/nif/controller.cpp
View file

@ -101,6 +101,18 @@ namespace Nif
data.post(nif); data.post(nif);
} }
void NiLookAtController::read(NIFStream *nif)
{
Controller::read(nif);
data.read(nif);
}
void NiLookAtController::post(NIFFile *nif)
{
Controller::post(nif);
data.post(nif);
}
void NiPathController::read(NIFStream *nif) void NiPathController::read(NIFStream *nif)
{ {
Controller::read(nif); Controller::read(nif);

9
components/nif/controller.hpp
View file

@ -99,6 +99,15 @@ public:
void post(NIFFile *nif); void post(NIFFile *nif);
}; };
class NiLookAtController : public Controller
{
public:
NiKeyframeDataPtr data;
void read(NIFStream *nif);
void post(NIFFile *nif);
};
class NiUVController : public Controller class NiUVController : public Controller
{ {
public: public:

1
components/nif/niffile.cpp
View file

@ -108,6 +108,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
newFactory.insert(makeEntry("NiSequenceStreamHelper", &construct <NiSequenceStreamHelper> , RC_NiSequenceStreamHelper )); newFactory.insert(makeEntry("NiSequenceStreamHelper", &construct <NiSequenceStreamHelper> , RC_NiSequenceStreamHelper ));
newFactory.insert(makeEntry("NiSourceTexture", &construct <NiSourceTexture> , RC_NiSourceTexture )); newFactory.insert(makeEntry("NiSourceTexture", &construct <NiSourceTexture> , RC_NiSourceTexture ));
newFactory.insert(makeEntry("NiSkinInstance", &construct <NiSkinInstance> , RC_NiSkinInstance )); newFactory.insert(makeEntry("NiSkinInstance", &construct <NiSkinInstance> , RC_NiSkinInstance ));
newFactory.insert(makeEntry("NiLookAtController", &construct <NiLookAtController> , RC_NiLookAtController ));
return newFactory; return newFactory;
} }

3
components/nif/record.hpp
View file

@ -93,7 +93,8 @@ enum RecordType
RC_NiSourceTexture, RC_NiSourceTexture,
RC_NiSkinInstance, RC_NiSkinInstance,
RC_RootCollisionNode, RC_RootCollisionNode,
RC_NiSphericalCollider RC_NiSphericalCollider,
RC_NiLookAtController
}; };
/// Base class for all records /// Base class for all records