krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Return a list of meshes and the skeleton from NIFLoader::load

Browse source
This commit is contained in:
Chris Robinson 2012-07-13 18:25:35 -07:00
parent fdfe40a55a
commit 939d0d2fc5
7 changed files with 146 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -26,8 +26,9 @@ CreatureAnimation::CreatureAnimation(const MWWorld::Ptr& ptr, OEngine::Render::O
{ {
std::string mesh = "meshes\\" + ref->base->model; std::string mesh = "meshes\\" + ref->base->model;
NifOgre::NIFLoader::load(mesh); // FIXME: There can be more than one!
base = mRend.getScene()->createEntity(mesh); NifOgre::MeshPairList meshes = NifOgre::NIFLoader::load(mesh);
base = mRend.getScene()->createEntity(meshes[0].first->getName());
base->setVisibilityFlags(RV_Actors); base->setVisibilityFlags(RV_Actors);
bool transparent = false; bool transparent = false;

12
apps/openmw/mwrender/npcanimation.cpp
View file

@ -82,8 +82,10 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRendere
assert(insert); assert(insert);
std::string smodel = (!isBeast ? "meshes\\base_anim.nif" : "meshes\\base_animkna.nif"); std::string smodel = (!isBeast ? "meshes\\base_anim.nif" : "meshes\\base_animkna.nif");
NifOgre::NIFLoader::load(smodel);
base = mRend.getScene()->createEntity(smodel); // FIXME: There can be more than one!
NifOgre::MeshPairList meshes = NifOgre::NIFLoader::load(smodel);
base = mRend.getScene()->createEntity(meshes[0].first->getName());
base->setVisibilityFlags(RV_Actors); base->setVisibilityFlags(RV_Actors);
bool transparent = false; bool transparent = false;
@ -382,9 +384,9 @@ void NpcAnimation::updateParts()
Ogre::Entity* NpcAnimation::insertBoundedPart(const std::string &mesh, const std::string &bonename) Ogre::Entity* NpcAnimation::insertBoundedPart(const std::string &mesh, const std::string &bonename)
{ {
// FIXME: There can be more than one!
NIFLoader::load(mesh); NifOgre::MeshPairList meshes = NIFLoader::load(mesh);
Ogre::Entity* part = mRend.getScene()->createEntity(mesh); Ogre::Entity* part = mRend.getScene()->createEntity(meshes[0].first->getName());
part->setVisibilityFlags(RV_Actors); part->setVisibilityFlags(RV_Actors);
base->attachObjectToBone(bonename, part); base->attachObjectToBone(bonename, part);

5
apps/openmw/mwrender/objects.cpp
View file

@ -92,8 +92,9 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
Ogre::SceneNode* insert = ptr.getRefData().getBaseNode(); Ogre::SceneNode* insert = ptr.getRefData().getBaseNode();
assert(insert); assert(insert);
NifOgre::NIFLoader::load(mesh); // FIXME: There can be more than one!
Ogre::Entity *ent = mRenderer.getScene()->createEntity(mesh); NifOgre::MeshPairList meshes = NifOgre::NIFLoader::load(mesh);
Ogre::Entity *ent = mRenderer.getScene()->createEntity(meshes[0].first->getName());
Ogre::Vector3 extents = ent->getBoundingBox().getSize(); Ogre::Vector3 extents = ent->getBoundingBox().getSize();

206
apps/openmw/mwrender/sky.cpp
View file

@ -453,16 +453,6 @@ void SkyManager::create()
HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton(); HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
// Stars // Stars
/// \todo sky_night_02.nif (available in Bloodmoon)
MeshPtr mesh = NifOgre::NIFLoader::load("meshes\\sky_night_01.nif");
Entity* night1_ent = mSceneMgr->createEntity("meshes\\sky_night_01.nif");
night1_ent->setRenderQueueGroup(RQG_SkiesEarly+1);
night1_ent->setVisibilityFlags(RV_Sky);
night1_ent->setCastShadows(false);
mAtmosphereNight = mRootNode->createChildSceneNode();
mAtmosphereNight->attachObject(night1_ent);
// Stars vertex shader // Stars vertex shader
HighLevelGpuProgramPtr stars_vp = mgr.createProgram("Stars_VP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, HighLevelGpuProgramPtr stars_vp = mgr.createProgram("Stars_VP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
"cg", GPT_VERTEX_PROGRAM); "cg", GPT_VERTEX_PROGRAM);
@ -517,35 +507,35 @@ void SkyManager::create()
stars_fp->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR); stars_fp->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR);
stars_fp->getDefaultParameters()->setNamedAutoConstant("diffuse", GpuProgramParameters::ACT_SURFACE_DIFFUSE_COLOUR); stars_fp->getDefaultParameters()->setNamedAutoConstant("diffuse", GpuProgramParameters::ACT_SURFACE_DIFFUSE_COLOUR);
for (unsigned int i=0; i<night1_ent->getNumSubEntities(); ++i) /// \todo sky_night_02.nif (available in Bloodmoon)
mAtmosphereNight = mRootNode->createChildSceneNode();
NifOgre::MeshPairList meshes = NifOgre::NIFLoader::load("meshes\\sky_night_01.nif");
for(size_t i = 0;i < meshes.size();i++)
{ {
MaterialPtr mp = night1_ent->getSubEntity(i)->getMaterial(); Entity* night1_ent = mSceneMgr->createEntity(meshes[i].first->getName());
mp->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0); night1_ent->setRenderQueueGroup(RQG_SkiesEarly+1);
mp->getTechnique(0)->getPass(0)->setAmbient(0.0, 0.0, 0.0); night1_ent->setVisibilityFlags(RV_Sky);
mp->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, 1.0); night1_ent->setCastShadows(false);
mp->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
mp->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false); mAtmosphereNight->attachObject(night1_ent);
mp->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
mp->getTechnique(0)->getPass(0)->setVertexProgram(stars_vp->getName()); for (unsigned int i=0; i<night1_ent->getNumSubEntities(); ++i)
mp->getTechnique(0)->getPass(0)->setFragmentProgram(stars_fp->getName()); {
mp->getTechnique(0)->getPass(0)->setPolygonModeOverrideable(false); MaterialPtr mp = night1_ent->getSubEntity(i)->getMaterial();
mStarsMaterials[i] = mp; mp->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0);
mp->getTechnique(0)->getPass(0)->setAmbient(0.0, 0.0, 0.0);
mp->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, 1.0);
mp->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
mp->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false);
mp->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
mp->getTechnique(0)->getPass(0)->setVertexProgram(stars_vp->getName());
mp->getTechnique(0)->getPass(0)->setFragmentProgram(stars_fp->getName());
mp->getTechnique(0)->getPass(0)->setPolygonModeOverrideable(false);
mStarsMaterials.push_back(mp);
}
} }
// Atmosphere (day) // Atmosphere (day)
mesh = NifOgre::NIFLoader::load("meshes\\sky_atmosphere.nif");
Entity* atmosphere_ent = mSceneMgr->createEntity("meshes\\sky_atmosphere.nif");
atmosphere_ent->setCastShadows(false);
ModVertexAlpha(atmosphere_ent, 0);
atmosphere_ent->setRenderQueueGroup(RQG_SkiesEarly);
atmosphere_ent->setVisibilityFlags(RV_Sky);
mAtmosphereDay = mRootNode->createChildSceneNode();
mAtmosphereDay->attachObject(atmosphere_ent);
mAtmosphereMaterial = atmosphere_ent->getSubEntity(0)->getMaterial();
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setPolygonModeOverrideable(false);
// Atmosphere shader // Atmosphere shader
HighLevelGpuProgramPtr vshader = mgr.createProgram("Atmosphere_VP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, HighLevelGpuProgramPtr vshader = mgr.createProgram("Atmosphere_VP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
"cg", GPT_VERTEX_PROGRAM); "cg", GPT_VERTEX_PROGRAM);
@ -555,22 +545,21 @@ void SkyManager::create()
StringUtil::StrStreamType outStream; StringUtil::StrStreamType outStream;
outStream << outStream <<
"void main_vp( \n" "void main_vp( \n"
" float4 position : POSITION, \n" " float4 position : POSITION, \n"
" in float4 color : COLOR, \n" " in float4 color : COLOR, \n"
" out float4 oPosition : POSITION, \n" " out float4 oPosition : POSITION, \n"
" out float4 oVertexColor : TEXCOORD0, \n" " out float4 oVertexColor : TEXCOORD0, \n"
" uniform float4x4 worldViewProj \n" " uniform float4x4 worldViewProj \n"
") \n" ") \n"
"{ \n" "{ \n"
" oPosition = mul( worldViewProj, position ); \n" " oPosition = mul( worldViewProj, position ); \n"
" oVertexColor = color; \n" " oVertexColor = color; \n"
"}"; "}";
vshader->setSource(outStream.str()); vshader->setSource(outStream.str());
vshader->load(); vshader->load();
vshader->getDefaultParameters()->setNamedAutoConstant("worldViewProj", GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX); vshader->getDefaultParameters()->setNamedAutoConstant("worldViewProj", GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setVertexProgram(vshader->getName());
HighLevelGpuProgramPtr fshader = mgr.createProgram("Atmosphere_FP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, HighLevelGpuProgramPtr fshader = mgr.createProgram("Atmosphere_FP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
"cg", GPT_FRAGMENT_PROGRAM); "cg", GPT_FRAGMENT_PROGRAM);
@ -580,15 +569,15 @@ void SkyManager::create()
StringUtil::StrStreamType _outStream; StringUtil::StrStreamType _outStream;
_outStream << _outStream <<
"void main_fp( \n" "void main_fp( \n"
" in float4 iVertexColor : TEXCOORD0, \n" " in float4 iVertexColor : TEXCOORD0, \n"
" out float4 oColor : COLOR, \n"; " out float4 oColor : COLOR, \n";
if (RenderingManager::useMRT()) _outStream << if (RenderingManager::useMRT()) _outStream <<
" out float4 oColor1 : COLOR1, \n"; " out float4 oColor1 : COLOR1, \n";
_outStream << _outStream <<
" uniform float4 emissive \n" " uniform float4 emissive \n"
") \n" ") \n"
"{ \n" "{ \n"
" oColor = iVertexColor * emissive; \n"; " oColor = iVertexColor * emissive; \n";
if (RenderingManager::useMRT()) _outStream << if (RenderingManager::useMRT()) _outStream <<
" oColor1 = float4(1, 0, 0, 1); \n"; " oColor1 = float4(1, 0, 0, 1); \n";
@ -598,19 +587,36 @@ void SkyManager::create()
fshader->load(); fshader->load();
fshader->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR); fshader->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setFragmentProgram(fshader->getName());
mAtmosphereDay = mRootNode->createChildSceneNode();
meshes = NifOgre::NIFLoader::load("meshes\\sky_atmosphere.nif");
for(size_t i = 0;i < meshes.size();i++)
{
Entity* atmosphere_ent = mSceneMgr->createEntity(meshes[i].first->getName());
atmosphere_ent->setCastShadows(false);
ModVertexAlpha(atmosphere_ent, 0);
atmosphere_ent->setRenderQueueGroup(RQG_SkiesEarly);
atmosphere_ent->setVisibilityFlags(RV_Sky);
mAtmosphereDay->attachObject(atmosphere_ent);
mAtmosphereMaterial = atmosphere_ent->getSubEntity(0)->getMaterial();
mAtmosphereMaterial = mAtmosphereMaterial->clone("Atmosphere");
atmosphere_ent->getSubEntity(0)->setMaterial(mAtmosphereMaterial);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setVertexProgram(vshader->getName());
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setFragmentProgram(fshader->getName());
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setPolygonModeOverrideable(false);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, 0.0);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setAmbient(0.0, 0.0, 0.0);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
}
// Clouds // Clouds
NifOgre::NIFLoader::load("meshes\\sky_clouds_01.nif");
Entity* clouds_ent = mSceneMgr->createEntity("meshes\\sky_clouds_01.nif");
clouds_ent->setVisibilityFlags(RV_Sky);
clouds_ent->setRenderQueueGroup(RQG_SkiesEarly+5);
SceneNode* clouds_node = mRootNode->createChildSceneNode();
clouds_node->attachObject(clouds_ent);
mCloudMaterial = clouds_ent->getSubEntity(0)->getMaterial();
mCloudMaterial->getTechnique(0)->getPass(0)->setPolygonModeOverrideable(false);
clouds_ent->setCastShadows(false);
// Clouds vertex shader // Clouds vertex shader
HighLevelGpuProgramPtr vshader2 = mgr.createProgram("Clouds_VP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, HighLevelGpuProgramPtr vshader2 = mgr.createProgram("Clouds_VP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
"cg", GPT_VERTEX_PROGRAM); "cg", GPT_VERTEX_PROGRAM);
@ -618,24 +624,23 @@ void SkyManager::create()
vshader2->setParameter("entry_point", "main_vp"); vshader2->setParameter("entry_point", "main_vp");
StringUtil::StrStreamType outStream3; StringUtil::StrStreamType outStream3;
outStream3 << outStream3 <<
"void main_vp( \n" "void main_vp( \n"
" float4 position : POSITION, \n" " float4 position : POSITION, \n"
" in float4 color : COLOR, \n" " in float4 color : COLOR, \n"
" out float4 oColor : TEXCOORD1, \n" " out float4 oColor : TEXCOORD1, \n"
" in float2 uv : TEXCOORD0, \n" " in float2 uv : TEXCOORD0, \n"
" out float2 oUV : TEXCOORD0, \n" " out float2 oUV : TEXCOORD0, \n"
" out float4 oPosition : POSITION, \n" " out float4 oPosition : POSITION, \n"
" uniform float4x4 worldViewProj \n" " uniform float4x4 worldViewProj \n"
") \n" ") \n"
"{ \n" "{ \n"
" oUV = uv; \n" " oUV = uv; \n"
" oColor = color; \n" " oColor = color; \n"
" oPosition = mul( worldViewProj, position ); \n" " oPosition = mul( worldViewProj, position ); \n"
"}"; "}";
vshader2->setSource(outStream3.str()); vshader2->setSource(outStream3.str());
vshader2->load(); vshader2->load();
vshader2->getDefaultParameters()->setNamedAutoConstant("worldViewProj", GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX); vshader2->getDefaultParameters()->setNamedAutoConstant("worldViewProj", GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);
mCloudMaterial->getTechnique(0)->getPass(0)->setVertexProgram(vshader2->getName());
// Clouds fragment shader // Clouds fragment shader
mCloudFragmentShader = mgr.createProgram("Clouds_FP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, mCloudFragmentShader = mgr.createProgram("Clouds_FP", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
@ -644,10 +649,10 @@ void SkyManager::create()
mCloudFragmentShader->setParameter("entry_point", "main_fp"); mCloudFragmentShader->setParameter("entry_point", "main_fp");
StringUtil::StrStreamType outStream2; StringUtil::StrStreamType outStream2;
outStream2 << outStream2 <<
"void main_fp( \n" "void main_fp( \n"
" in float2 uv : TEXCOORD0, \n" " in float2 uv : TEXCOORD0, \n"
" in float4 color : TEXCOORD1, \n" " in float4 color : TEXCOORD1, \n"
" out float4 oColor : COLOR, \n"; " out float4 oColor : COLOR, \n";
if (RenderingManager::useMRT()) outStream2 << if (RenderingManager::useMRT()) outStream2 <<
" out float4 oColor1 : COLOR1, \n"; " out float4 oColor1 : COLOR1, \n";
outStream2 << outStream2 <<
@ -658,8 +663,8 @@ void SkyManager::create()
" uniform float speed, \n" " uniform float speed, \n"
" uniform float opacity, \n" " uniform float opacity, \n"
" uniform float4 emissive \n" " uniform float4 emissive \n"
") \n" ") \n"
"{ \n" "{ \n"
" uv += float2(0,1) * time * speed * 0.003; \n" // Scroll in y direction " uv += float2(0,1) * time * speed * 0.003; \n" // Scroll in y direction
" float4 tex = lerp(tex2D(texture, uv), tex2D(secondTexture, uv), transitionFactor); \n" " float4 tex = lerp(tex2D(texture, uv), tex2D(secondTexture, uv), transitionFactor); \n"
" oColor = color * float4(emissive.xyz,1) * tex * float4(1,1,1,opacity); \n"; " oColor = color * float4(emissive.xyz,1) * tex * float4(1,1,1,opacity); \n";
@ -670,31 +675,36 @@ void SkyManager::create()
mCloudFragmentShader->setSource(outStream2.str()); mCloudFragmentShader->setSource(outStream2.str());
mCloudFragmentShader->load(); mCloudFragmentShader->load();
mCloudFragmentShader->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR); mCloudFragmentShader->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR);
mCloudMaterial->getTechnique(0)->getPass(0)->setFragmentProgram(mCloudFragmentShader->getName());
SceneNode* clouds_node = mRootNode->createChildSceneNode();
meshes = NifOgre::NIFLoader::load("meshes\\sky_clouds_01.nif");
for(size_t i = 0;i < meshes.size();i++)
{
Entity* clouds_ent = mSceneMgr->createEntity(meshes[i].first->getName());
clouds_ent->setVisibilityFlags(RV_Sky);
clouds_ent->setRenderQueueGroup(RQG_SkiesEarly+5);
clouds_node->attachObject(clouds_ent);
mCloudMaterial = clouds_ent->getSubEntity(0)->getMaterial();
mCloudMaterial = mCloudMaterial->clone("Clouds");
clouds_ent->getSubEntity(0)->setMaterial(mCloudMaterial);
mCloudMaterial->getTechnique(0)->getPass(0)->setPolygonModeOverrideable(false);
clouds_ent->setCastShadows(false);
mCloudMaterial->getTechnique(0)->getPass(0)->setVertexProgram(vshader2->getName());
mCloudMaterial->getTechnique(0)->getPass(0)->setFragmentProgram(mCloudFragmentShader->getName());
ModVertexAlpha(clouds_ent, 1);
mCloudMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0);
mCloudMaterial->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
mCloudMaterial->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
mCloudMaterial->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
mCloudMaterial->getTechnique(0)->getPass(0)->createTextureUnitState("textures\\tx_sky_cloudy.dds");
mCloudMaterial->getTechnique(0)->getPass(0)->createTextureUnitState("");
}
setCloudsOpacity(0.75); setCloudsOpacity(0.75);
ModVertexAlpha(clouds_ent, 1);
// I'm not sure if the materials are being used by any other objects
// Make a unique "modifiable" copy of the materials to be sure
mCloudMaterial = mCloudMaterial->clone("Clouds");
clouds_ent->getSubEntity(0)->setMaterial(mCloudMaterial);
mAtmosphereMaterial = mAtmosphereMaterial->clone("Atmosphere");
atmosphere_ent->getSubEntity(0)->setMaterial(mAtmosphereMaterial);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, 0.0);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setAmbient(0.0, 0.0, 0.0);
mCloudMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0);
mCloudMaterial->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
mAtmosphereMaterial->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
mCloudMaterial->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
mCloudMaterial->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
mCloudMaterial->getTechnique(0)->getPass(0)->createTextureUnitState("textures\\tx_sky_cloudy.dds");
mCloudMaterial->getTechnique(0)->getPass(0)->createTextureUnitState("");
mCreated = true; mCreated = true;
} }
@ -851,7 +861,7 @@ void SkyManager::setWeather(const MWWorld::WeatherResult& weather)
else else
{ {
mAtmosphereNight->setVisible(true); mAtmosphereNight->setVisible(true);
for (int i=0; i<7; ++i) for (size_t i=0; i<mStarsMaterials.size(); ++i)
mStarsMaterials[i]->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, weather.mNightFade); mStarsMaterials[i]->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, weather.mNightFade);
mStarsOpacity = weather.mNightFade; mStarsOpacity = weather.mNightFade;
} }

5
apps/openmw/mwrender/sky.hpp
View file

@ -1,13 +1,14 @@
#ifndef _GAME_RENDER_SKY_H #ifndef _GAME_RENDER_SKY_H
#define _GAME_RENDER_SKY_H #define _GAME_RENDER_SKY_H
#include <vector>
#include <OgreVector3.h> #include <OgreVector3.h>
#include <OgreString.h> #include <OgreString.h>
#include <OgreMaterial.h> #include <OgreMaterial.h>
#include <OgreColourValue.h> #include <OgreColourValue.h>
#include <OgreHighLevelGpuProgram.h> #include <OgreHighLevelGpuProgram.h>
#include "sky.hpp"
#include "../mwworld/weather.hpp" #include "../mwworld/weather.hpp"
namespace Ogre namespace Ogre
@ -195,7 +196,7 @@ namespace MWRender
Ogre::MaterialPtr mCloudMaterial; Ogre::MaterialPtr mCloudMaterial;
Ogre::MaterialPtr mAtmosphereMaterial; Ogre::MaterialPtr mAtmosphereMaterial;
Ogre::MaterialPtr mStarsMaterials[7]; std::vector<Ogre::MaterialPtr> mStarsMaterials;
Ogre::HighLevelGpuProgramPtr mCloudFragmentShader; Ogre::HighLevelGpuProgramPtr mCloudFragmentShader;

12
components/nifogre/ogre_nif_loader.cpp
View file

@ -322,12 +322,16 @@ void NIFLoader::createMaterial(const Ogre::String &name,
void NIFLoader::loadResource(Ogre::Resource *resource) void NIFLoader::loadResource(Ogre::Resource *resource)
{ {
warn("Found no records in NIF."); warn("Found no records in NIF for "+resource->getName());
} }
Ogre::MeshPtr NIFLoader::load(const std::string &name, const std::string &group) MeshPairList NIFLoader::load(const std::string &name, Ogre::SkeletonPtr *skel, const std::string &group)
{ {
Ogre::MeshManager &meshMgr = Ogre::MeshManager::getSingleton(); Ogre::MeshManager &meshMgr = Ogre::MeshManager::getSingleton();
MeshPairList ret;
if(skel != NULL)
skel->setNull();
// Check if the resource already exists // Check if the resource already exists
Ogre::MeshPtr themesh = meshMgr.getByName(name, group); Ogre::MeshPtr themesh = meshMgr.getByName(name, group);
@ -336,7 +340,9 @@ Ogre::MeshPtr NIFLoader::load(const std::string &name, const std::string &group)
NIFLoader *loader = &sLoaders[name]; NIFLoader *loader = &sLoaders[name];
themesh = meshMgr.createManual(name, group, loader); themesh = meshMgr.createManual(name, group, loader);
} }
return themesh; ret.push_back(std::make_pair(themesh, std::string()));
return ret;
} }

20
components/nifogre/ogre_nif_loader.hpp
View file

@ -26,6 +26,7 @@
#include <OgreResource.h> #include <OgreResource.h>
#include <OgreMesh.h> #include <OgreMesh.h>
#include <OgreSkeleton.h>
#include <cassert> #include <cassert>
#include <string> #include <string>
@ -67,6 +68,12 @@ namespace Nif
namespace NifOgre namespace NifOgre
{ {
/** This holds a list of meshes along with the names of their parent nodes
*/
typedef std::vector< std::pair<Ogre::MeshPtr,std::string> > MeshPairList;
/** Manual resource loader for NIF meshes. This is the main class /** Manual resource loader for NIF meshes. This is the main class
responsible for translating the internal NIF mesh structure into responsible for translating the internal NIF mesh structure into
something Ogre can use. something Ogre can use.
@ -75,19 +82,18 @@ namespace NifOgre
NIFLoader::load("somemesh.nif"); NIFLoader::load("somemesh.nif");
Afterwards, you can use the mesh name "somemesh.nif" normally to This returns a list of meshes used by the model, as well as the names of
create entities and so on. The mesh isn't loaded from disk until their parent nodes (as they pertain to the skeleton, which is optionally
OGRE needs it for rendering. Thus the above load() command is not returned in the second argument if it exists).
very resource intensive, and can safely be done for a large number
of meshes at load time.
*/ */
class NIFLoader : Ogre::ManualResourceLoader class NIFLoader : Ogre::ManualResourceLoader
{ {
public: public:
virtual void loadResource(Ogre::Resource *resource); virtual void loadResource(Ogre::Resource *resource);
static Ogre::MeshPtr load(const std::string &name, static MeshPairList load(const std::string &name,
const std::string &group="General"); Ogre::SkeletonPtr *skel=NULL,
const std::string &group="General");
private: private:
void warn(const std::string &msg); void warn(const std::string &msg);