summaryrefslogtreecommitdiff
path: root/src/camera.cpp
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2015-07-21 23:56:41 +0200
committerRealBadAngel <maciej.kasatkin@o2.pl>2015-07-21 23:56:41 +0200
commit60350699c792b816b20704d59cfbda0894cdba39 (patch)
tree59e9a369d9ea87804035ee27ea902a81b4f90060 /src/camera.cpp
parent5b0c719171eb9ccb8f2829eb1cc8b3fe9f24cd05 (diff)
downloadminetest-60350699c792b816b20704d59cfbda0894cdba39.tar.gz
minetest-60350699c792b816b20704d59cfbda0894cdba39.tar.bz2
minetest-60350699c792b816b20704d59cfbda0894cdba39.zip
Add wielded (and CAOs) shader
Diffstat (limited to 'src/camera.cpp')
-rw-r--r--src/camera.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/camera.cpp b/src/camera.cpp
index 46df0575c..0c6d03e4e 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -92,10 +92,9 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
// all other 3D scene nodes and before the GUI.
m_wieldmgr = smgr->createNewSceneManager();
m_wieldmgr->addCameraSceneNode();
- m_wieldnode = new WieldMeshSceneNode(m_wieldmgr->getRootSceneNode(), m_wieldmgr, -1, true);
+ m_wieldnode = new WieldMeshSceneNode(m_wieldmgr->getRootSceneNode(), m_wieldmgr, -1, false);
m_wieldnode->setItem(ItemStack(), m_gamedef);
m_wieldnode->drop(); // m_wieldmgr grabbed it
- m_wieldlightnode = m_wieldmgr->addLightSceneNode(NULL, v3f(0.0, 50.0, 0.0));
/* TODO: Add a callback function so these can be updated when a setting
* changes. At this point in time it doesn't matter (e.g. /set
@@ -451,11 +450,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
m_wieldnode->setPosition(wield_position);
m_wieldnode->setRotation(wield_rotation);
- // Shine light upon the wield mesh
- video::SColor black(255,0,0,0);
- m_wieldmgr->setAmbientLight(player->light_color.getInterpolated(black, 0.7));
- m_wieldlightnode->getLightData().DiffuseColor = player->light_color.getInterpolated(black, 0.3);
- m_wieldlightnode->setPosition(v3f(30+5*sin(2*player->getYaw()*M_PI/180), -50, 0));
+ m_wieldnode->setColor(player->light_color);
// Render distance feedback loop
updateViewingRange(frametime, busytime);