mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 07:09:40 +00:00
Code Issues Releases Wiki Activity

temp commit

Browse source
This commit is contained in:
scrawl 2012-07-09 19:20:41 +02:00
parent e517e75d09
commit 81d30ff63a
8 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/localmap.cpp
View file

@ -229,9 +229,9 @@ void LocalMap::render(const float x, const float y,
vp->setVisibilityMask(RV_Map);
// use fallback techniques without shadows and without mrt
vp->setMaterialScheme("simple");
//vp->setMaterialScheme("local_map");
rtt->update();
//rtt->update();
// create "fog of war" texture
TexturePtr tex2 = TextureManager::getSingleton().createManual(

11
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -76,9 +76,8 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
// Load resources
ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
// Due to the huge world size of MW, we'll want camera-relative rendering.
// This prevents precision artifacts when moving very far from the origin.
mRendering.getScene()->setCameraRelativeRendering(true);
// causes light flicker in opengl when moving..
//mRendering.getScene()->setCameraRelativeRendering(true);
// disable unsupported effects
const RenderSystemCapabilities* caps = Root::getSingleton().getRenderSystem()->getCapabilities();
@ -525,12 +524,14 @@ Shadows* RenderingManager::getShadows()
void RenderingManager::switchToInterior()
{
mRendering.getScene()->setCameraRelativeRendering(false);
// causes light flicker in opengl when moving..
//mRendering.getScene()->setCameraRelativeRendering(false);
}
void RenderingManager::switchToExterior()
{
mRendering.getScene()->setCameraRelativeRendering(true);
// causes light flicker in opengl when moving..
//mRendering.getScene()->setCameraRelativeRendering(true);
}
Ogre::Vector4 RenderingManager::boundingBoxToScreen(Ogre::AxisAlignedBox bounds)

6
apps/openmw/mwrender/shadows.cpp
View file

@ -53,7 +53,7 @@ void Shadows::recreate()
mSceneMgr->setShadowTextureSelfShadow(true);
mSceneMgr->setShadowCasterRenderBackFaces(true);
mSceneMgr->setShadowTextureCasterMaterial("depth_shadow_caster");
// mSceneMgr->setShadowTextureCasterMaterial("openmw_shadowcaster_default");
mSceneMgr->setShadowTexturePixelFormat(PF_FLOAT32_R);
mSceneMgr->setShadowDirectionalLightExtrusionDistance(1000000);
@ -111,7 +111,7 @@ void Shadows::recreate()
// --------------------------------------------------------------------------------------------------------------------
// --------------------------- Debug overlays to display the content of shadow maps -----------------------------------
// --------------------------------------------------------------------------------------------------------------------
/*
OverlayManager& mgr = OverlayManager::getSingleton();
Overlay* overlay;
@ -157,7 +157,7 @@ void Shadows::recreate()
overlay->add2D(debugPanel);
overlay->show();
}
*/
}
PSSMShadowCameraSetup* Shadows::getPSSMSetup()

2
apps/openmw/mwrender/water.cpp
View file

@ -336,7 +336,7 @@ void Water::applyRTT()
vp->setBackgroundColour(ColourValue(0.8f, 0.9f, 1.0f));
vp->setShadowsEnabled(false);
// use fallback techniques without shadows and without mrt (currently not implemented for sky and terrain)
vp->setMaterialScheme("simple");
//vp->setMaterialScheme("water_reflection");
rtt->addListener(this);
rtt->setActive(true);

2
components/nifogre/ogre_nif_loader.cpp
View file

@ -276,6 +276,8 @@ void NIFLoader::createMaterial(const String &name,
else
warn("Unhandled alpha setting for texture " + texName);
}
//else
//instance->getMaterial ()->setShadowCasterMaterial ("openmw_shadowcaster_noalpha");
// As of yet UNTESTED code from Chris:
/*pass->setTextureFiltering(Ogre::TFO_ANISOTROPIC);

2
extern/shiny vendored

@ -1 +1 @@
Subproject commit 88a192a67d7dff636be4540be4a8654ad33f106a
Subproject commit d25605ee3a2d67dc0b6367cd150cc6d0c6a3b661

3
files/materials/objects.mat
View file

@ -14,6 +14,9 @@ material openmw_objects_base
scene_blend default
depth_write default
alpha_rejection default
shadow_transparency true // use diffuse alpha as mask for shadow
shadow_caster_material openmw_shadowcaster
pass
{

2
files/materials/objects.shader
View file

@ -72,7 +72,7 @@
shInput(float3, normalPassthrough)
shInput(float3, objSpacePositionPassthrough)
shUniform(float4 lightAmbient) @shAutoConstant(lightAmbient, ambient_light_colour)
shUniform(float passIteration) @shAutoConstant(passIteration, pass_iteration_number)
//shUniform(float passIteration) @shAutoConstant(passIteration, pass_iteration_number)
shUniform(float4 materialAmbient) @shAutoConstant(materialAmbient, surface_ambient_colour)
shUniform(float4 materialDiffuse) @shAutoConstant(materialDiffuse, surface_diffuse_colour)
shUniform(float4 materialEmissive) @shAutoConstant(materialEmissive, surface_emissive_colour)