#include "player.h"
#include "tile.h"
#include <cmath>
-
-const s32 BOBFRAMES = 0x1000000; // must be a power of two
+#include <SAnimatedMesh.h>
+#include "settings.h"
Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control):
m_smgr(smgr),
m_playernode(NULL),
m_headnode(NULL),
m_cameranode(NULL),
+
+ m_wieldmgr(NULL),
+ m_wieldnode(NULL),
+
m_draw_control(draw_control),
m_viewing_range_min(5.0),
m_viewing_range_max(5.0),
m_view_bobbing_speed(0),
m_digging_anim(0),
- m_digging_speed(0)
+ m_digging_button(-1)
{
//dstream<<__FUNCTION_NAME<<std::endl;
m_headnode = smgr->addEmptySceneNode(m_playernode);
m_cameranode = smgr->addCameraSceneNode(smgr->getRootSceneNode());
m_cameranode->bindTargetAndRotation(true);
- m_wieldnode = new ExtrudedSpriteSceneNode(m_headnode, smgr, -1, v3f(1.3, -1, 2), v3f(-20, -100, 20), v3f(1));
+
+ // This needs to be in its own scene manager. It is drawn after
+ // all other 3D scene nodes and before the GUI.
+ m_wieldmgr = smgr->createNewSceneManager();
+ m_wieldmgr->addCameraSceneNode();
+ m_wieldnode = new ExtrudedSpriteSceneNode(m_wieldmgr->getRootSceneNode(), m_wieldmgr);
updateSettings();
}
Camera::~Camera()
{
+ m_wieldmgr->drop();
+ m_wieldnode->drop();
}
bool Camera::successfullyCreated(std::wstring& error_message)
error_message = L"Failed to create the camera scene node";
return false;
}
+ if (m_wieldmgr == NULL)
+ {
+ error_message = L"Failed to create the wielded item scene manager";
+ return false;
+ }
+ if (m_wieldnode == NULL)
+ {
+ error_message = L"Failed to create the wielded item scene node";
+ return false;
+ }
return true;
}
+// Returns the fractional part of x
+inline f32 my_modf(f32 x)
+{
+ double dummy;
+ return modf(x, &dummy);
+}
+
void Camera::step(f32 dtime)
{
if (m_view_bobbing_state != 0)
{
- s32 offset = MYMAX(dtime * m_view_bobbing_speed * 0.035 * BOBFRAMES, 1);
+ //f32 offset = dtime * m_view_bobbing_speed * 0.035;
+ f32 offset = dtime * m_view_bobbing_speed * 0.030;
if (m_view_bobbing_state == 2)
{
+#if 0
// Animation is getting turned off
- s32 subanim = (m_view_bobbing_anim & (BOBFRAMES/2-1));
- if (subanim < BOBFRAMES/4)
- offset = -1 * MYMIN(offset, subanim);
+ if (m_view_bobbing_anim < 0.5)
+ m_view_bobbing_anim -= offset;
else
- offset = MYMIN(offset, BOBFRAMES/2 - subanim);
+ m_view_bobbing_anim += offset;
+ if (m_view_bobbing_anim <= 0 || m_view_bobbing_anim >= 1)
+ {
+ m_view_bobbing_anim = 0;
+ m_view_bobbing_state = 0;
+ }
+#endif
+#if 1
+ // Animation is getting turned off
+ if(m_view_bobbing_anim < 0.25){
+ m_view_bobbing_anim -= offset;
+ } else if(m_view_bobbing_anim > 0.75){
+ m_view_bobbing_anim += offset;
+ } if(m_view_bobbing_anim < 0.5){
+ m_view_bobbing_anim += offset;
+ if(m_view_bobbing_anim > 0.5)
+ m_view_bobbing_anim = 0.5;
+ } else {
+ m_view_bobbing_anim -= offset;
+ if(m_view_bobbing_anim < 0.5)
+ m_view_bobbing_anim = 0.5;
+ }
+ if(m_view_bobbing_anim <= 0 || m_view_bobbing_anim >= 1 ||
+ fabs(m_view_bobbing_anim - 0.5) < 0.01)
+ {
+ m_view_bobbing_anim = 0;
+ m_view_bobbing_state = 0;
+ }
+#endif
+ }
+ else
+ {
+ m_view_bobbing_anim = my_modf(m_view_bobbing_anim + offset);
+ }
+ }
+
+ if (m_digging_button != -1)
+ {
+ f32 offset = dtime * 3.5;
+ m_digging_anim += offset;
+ if (m_digging_anim >= 1)
+ {
+ m_digging_anim = 0;
+ m_digging_button = -1;
}
- m_view_bobbing_anim = (m_view_bobbing_anim + offset) & (BOBFRAMES-1);
}
}
m_playernode->updateAbsolutePosition();
// Set head node transformation
- v3f eye_offset = player->getEyePosition() - player->getPosition();
- m_headnode->setPosition(eye_offset);
+ m_headnode->setPosition(player->getEyeOffset());
m_headnode->setRotation(v3f(player->getPitch(), 0, 0));
m_headnode->updateAbsolutePosition();
v3f rel_cam_target = v3f(0,0,1);
v3f rel_cam_up = v3f(0,1,0);
- s32 bobframe = m_view_bobbing_anim & (BOBFRAMES/2-1);
- if (bobframe != 0)
+ if (m_view_bobbing_anim != 0)
{
- f32 bobfrac = (f32) bobframe / (BOBFRAMES/2);
- f32 bobdir = (m_view_bobbing_anim < (BOBFRAMES/2)) ? 1.0 : -1.0;
+ f32 bobfrac = my_modf(m_view_bobbing_anim * 2);
+ f32 bobdir = (m_view_bobbing_anim < 0.5) ? 1.0 : -1.0;
#if 1
f32 bobknob = 1.2;
f32 bobtmp = sin(pow(bobfrac, bobknob) * PI);
+ //f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
v3f bobvec = v3f(
- bobdir * sin(bobfrac * PI),
- 0.8 * bobtmp * bobtmp,
+ 0.3 * bobdir * sin(bobfrac * PI),
+ -0.28 * bobtmp * bobtmp,
0.);
- rel_cam_pos += 0.03 * bobvec;
- rel_cam_target += 0.045 * bobvec;
- rel_cam_up.rotateXYBy(0.03 * bobdir * bobtmp * PI);
+ //rel_cam_pos += 0.2 * bobvec;
+ //rel_cam_target += 0.03 * bobvec;
+ //rel_cam_up.rotateXYBy(0.02 * bobdir * bobtmp * PI);
+ float f = 1.0;
+ f *= g_settings->getFloat("view_bobbing_amount");
+ rel_cam_pos += bobvec * f;
+ //rel_cam_target += 0.995 * bobvec * f;
+ rel_cam_target += bobvec * f;
+ rel_cam_target.Z -= 0.005 * bobvec.Z * f;
+ //rel_cam_target.X -= 0.005 * bobvec.X * f;
+ //rel_cam_target.Y -= 0.005 * bobvec.Y * f;
+ rel_cam_up.rotateXYBy(-0.03 * bobdir * bobtmp * PI * f);
#else
f32 angle_deg = 1 * bobdir * sin(bobfrac * PI);
f32 angle_rad = angle_deg * PI / 180;
// Compute absolute camera position and target
m_headnode->getAbsoluteTransformation().transformVect(m_camera_position, rel_cam_pos);
- m_headnode->getAbsoluteTransformation().transformVect(m_camera_direction, rel_cam_target);
- m_camera_direction -= m_camera_position;
+ m_headnode->getAbsoluteTransformation().rotateVect(m_camera_direction, rel_cam_target - rel_cam_pos);
v3f abs_cam_up;
- m_headnode->getAbsoluteTransformation().transformVect(abs_cam_up, rel_cam_pos + rel_cam_up);
- abs_cam_up -= m_camera_position;
+ m_headnode->getAbsoluteTransformation().rotateVect(abs_cam_up, rel_cam_up);
// Set camera node transformation
m_cameranode->setPosition(m_camera_position);
m_cameranode->setUpVector(abs_cam_up);
- m_cameranode->setTarget(m_camera_position + m_camera_direction);
+ // *100.0 helps in large map coordinates
+ m_cameranode->setTarget(m_camera_position + 100 * m_camera_direction);
// FOV and and aspect ratio
m_aspect = (f32)screensize.X / (f32) screensize.Y;
// Some more allowance that m_viewing_range_max * BS because of active objects etc.
m_cameranode->setFarValue(m_viewing_range_max * BS * 10);
+ // Position the wielded item
+ v3f wield_position = v3f(45, -35, 65);
+ v3f wield_rotation = v3f(-100, 110, -100);
+ if (m_digging_button != -1)
+ {
+ f32 digfrac = m_digging_anim;
+ wield_position.X -= 30 * sin(pow(digfrac, 0.8f) * PI);
+ wield_position.Y += 15 * sin(digfrac * 2 * PI);
+ wield_position.Z += 5 * digfrac;
+
+ // Euler angles are PURE EVIL, so why not use quaternions?
+ core::quaternion quat_begin(wield_rotation * core::DEGTORAD);
+ core::quaternion quat_end(v3f(90, -10, -130) * core::DEGTORAD);
+ core::quaternion quat_slerp;
+ quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * PI));
+ quat_slerp.toEuler(wield_rotation);
+ wield_rotation *= core::RADTODEG;
+ }
+ else {
+ f32 bobfrac = my_modf(m_view_bobbing_anim);
+ wield_position.X -= sin(bobfrac*PI*2.0) * 3.0;
+ wield_position.Y += sin(my_modf(bobfrac*2.0)*PI) * 3.0;
+ }
+ m_wieldnode->setPosition(wield_position);
+ m_wieldnode->setRotation(wield_rotation);
+ m_wieldnode->updateLight(player->light);
+
// Render distance feedback loop
updateViewingRange(frametime);
v3f speed = player->getSpeed();
if ((hypot(speed.X, speed.Z) > BS) &&
(player->touching_ground) &&
- (g_settings.getBool("view_bobbing") == true) &&
- (g_settings.getBool("free_move") == false))
+ (g_settings->getBool("view_bobbing") == true) &&
+ (g_settings->getBool("free_move") == false))
{
// Start animation
m_view_bobbing_state = 1;
{
// Stop animation
m_view_bobbing_state = 2;
- m_view_bobbing_speed = 100;
- }
- else if (m_view_bobbing_state == 2 && bobframe == 0)
- {
- // Stop animation completed
- m_view_bobbing_state = 0;
+ m_view_bobbing_speed = 60;
}
}
<<std::endl;*/
m_draw_control.wanted_min_range = m_viewing_range_min;
- m_draw_control.wanted_max_blocks = (1.5*m_draw_control.blocks_would_have_drawn)+1;
+ m_draw_control.wanted_max_blocks = (2.0*m_draw_control.blocks_would_have_drawn)+1;
if (m_draw_control.wanted_max_blocks < 10)
m_draw_control.wanted_max_blocks = 10;
//dstream<<"wanted_frametime_change="<<wanted_frametime_change<<std::endl;
// If needed frametime change is small, just return
- if (fabs(wanted_frametime_change) < m_wanted_frametime*0.4)
+ // This value was 0.4 for many months until 2011-10-18 by c55;
+ // Let's see how this works out.
+ if (fabs(wanted_frametime_change) < m_wanted_frametime*0.33)
{
//dstream<<"ignoring small wanted_frametime_change"<<std::endl;
return;
void Camera::updateSettings()
{
- m_viewing_range_min = g_settings.getS16("viewing_range_nodes_min");
+ m_viewing_range_min = g_settings->getS16("viewing_range_nodes_min");
m_viewing_range_min = MYMAX(5.0, m_viewing_range_min);
- m_viewing_range_max = g_settings.getS16("viewing_range_nodes_max");
+ m_viewing_range_max = g_settings->getS16("viewing_range_nodes_max");
m_viewing_range_max = MYMAX(m_viewing_range_min, m_viewing_range_max);
- f32 fov_degrees = g_settings.getFloat("fov");
+ f32 fov_degrees = g_settings->getFloat("fov");
fov_degrees = MYMAX(fov_degrees, 10.0);
fov_degrees = MYMIN(fov_degrees, 170.0);
m_fov_y = fov_degrees * PI / 180.0;
- f32 wanted_fps = g_settings.getFloat("wanted_fps");
+ f32 wanted_fps = g_settings->getFloat("wanted_fps");
wanted_fps = MYMAX(wanted_fps, 1.0);
m_wanted_frametime = 1.0 / wanted_fps;
}
if (content_features(content).solidness || content_features(content).visual_solidness)
{
m_wieldnode->setCube(content_features(content).tiles);
- m_wieldnode->setScale(v3f(0.9));
+ m_wieldnode->setScale(v3f(30));
isCube = true;
}
}
if (!isCube)
{
m_wieldnode->setSprite(item->getImageRaw());
- m_wieldnode->setScale(v3f(1.2));
+ m_wieldnode->setScale(v3f(40));
}
m_wieldnode->setVisible(true);
else
{
// Bare hands
- dstream << "bare hands" << std::endl;
m_wieldnode->setVisible(false);
}
}
-void Camera::setDigging(bool digging)
+void Camera::setDigging(s32 button)
+{
+ if (m_digging_button == -1)
+ m_digging_button = button;
+}
+
+void Camera::drawWieldedTool()
{
- // TODO
+ m_wieldmgr->getVideoDriver()->clearZBuffer();
+
+ scene::ICameraSceneNode* cam = m_wieldmgr->getActiveCamera();
+ cam->setAspectRatio(m_cameranode->getAspectRatio());
+ cam->setFOV(m_cameranode->getFOV());
+ cam->setNearValue(0.1);
+ cam->setFarValue(100);
+ m_wieldmgr->drawAll();
}
m_thickness = 0.1;
m_cubemesh = NULL;
m_is_cube = false;
+ m_light = LIGHT_MAX;
}
ExtrudedSpriteSceneNode::~ExtrudedSpriteSceneNode()
m_meshnode->getMaterial(0).MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
m_meshnode->setVisible(true);
m_is_cube = false;
+ updateLight(m_light);
}
void ExtrudedSpriteSceneNode::setCube(const TileSpec tiles[6])
}
m_meshnode->setVisible(true);
m_is_cube = true;
+ updateLight(m_light);
+}
+
+void ExtrudedSpriteSceneNode::updateLight(u8 light)
+{
+ m_light = light;
+
+ u8 li = decode_light(light);
+ // Set brightness one lower than incoming light
+ diminish_light(li);
+ video::SColor color(255,li,li,li);
+ setMeshVerticesColor(m_meshnode->getMesh(), color);
}
void ExtrudedSpriteSceneNode::removeSpriteFromCache(video::ITexture* texture)
projects / oweals / minetest.git / blobdiff