BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

trying something else... also replaced M_PI by PI everywhere

Browse Source
This commit is contained in:
Kahrl 2011-09-08 16:10:44 +02:00
parent 71418639d3
commit e4cb004460
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/camera.cpp
View File

@ -105,10 +105,10 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
if ((m_view_bobbing_anim & (BOBFRAMES/2-1)) != 0) if ((m_view_bobbing_anim & (BOBFRAMES/2-1)) != 0)
{ {
f32 bobamount = cos(player->getPitch() * M_PI / 180); f32 bobamount = cos(player->getPitch() * PI / 180);
bobamount = 2 * MYMIN(bobamount, 0.5); bobamount = 2 * MYMIN(bobamount, 0.5);
f32 bobangle = m_view_bobbing_anim * 2 * M_PI / BOBFRAMES; f32 bobangle = m_view_bobbing_anim * 2 * PI / BOBFRAMES;
f32 bobangle_s = sin(bobangle); f32 bobangle_s = sin(bobangle);
f32 bobangle_c = cos(bobangle); f32 bobangle_c = cos(bobangle);
f32 bobwidth = 0.02 * bobamount / (bobangle_c * bobangle_c + 1); f32 bobwidth = 0.02 * bobamount / (bobangle_c * bobangle_c + 1);
@ -282,7 +282,7 @@ void Camera::updateSettings()
f32 fov_degrees = g_settings.getFloat("fov"); f32 fov_degrees = g_settings.getFloat("fov");
fov_degrees = MYMAX(fov_degrees, 10.0); fov_degrees = MYMAX(fov_degrees, 10.0);
fov_degrees = MYMIN(fov_degrees, 170.0); fov_degrees = MYMIN(fov_degrees, 170.0);
m_fov_y = fov_degrees * M_PI / 180.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); wanted_fps = MYMAX(wanted_fps, 1.0);

9
src/game.cpp
View File

@ -831,7 +831,7 @@ void the_game(
Tool Tool
*/ */
v3f tool_wield_position(0.06*BS, 1.619*BS, 0.1*BS); v3f tool_wield_position(0.06*BS, -0.06*BS, 0.1*BS);
v3f tool_wield_rotation(-25, 180, -25); v3f tool_wield_rotation(-25, 180, -25);
float tool_wield_animation = 0.0; float tool_wield_animation = 0.0;
scene::IMeshSceneNode *tool_wield; scene::IMeshSceneNode *tool_wield;
@ -856,7 +856,7 @@ void the_game(
mesh->addMeshBuffer(buf); mesh->addMeshBuffer(buf);
buf->drop(); buf->drop();
tool_wield = smgr->addMeshSceneNode(mesh, camera.getPlayerNode()); tool_wield = smgr->addMeshSceneNode(mesh, camera.getCameraNode());
mesh->drop(); mesh->drop();
} }
tool_wield->setVisible(false); tool_wield->setVisible(false);
@ -1997,8 +1997,9 @@ void the_game(
Animate tool Animate tool
*/ */
{ {
tool_wield->setRotation(tool_wield_rotation - sin(tool_wield_animation * PI) * 40.0); f32 tool_wield_sin = sin(tool_wield_animation * PI);
tool_wield->setPosition(tool_wield_position - sin(tool_wield_animation * PI) / 3.0); tool_wield->setRotation(tool_wield_rotation - tool_wield_sin * 40.0);
tool_wield->setPosition(tool_wield_position - tool_wield_sin * BS / 30.0);
} }

2
src/map.cpp
View File

@ -3605,7 +3605,7 @@ ClientMap::ClientMap(
m_control(control), m_control(control),
m_camera_position(0,0,0), m_camera_position(0,0,0),
m_camera_direction(0,0,1), m_camera_direction(0,0,1),
m_camera_fov(M_PI) m_camera_fov(PI)
{ {
m_camera_mutex.Init(); m_camera_mutex.Init();
assert(m_camera_mutex.IsInitialized()); assert(m_camera_mutex.IsInitialized());

2
src/server.cpp
View File

@ -584,7 +584,7 @@ void RemoteClient::GetNextBlocks(Server *server, float dtime,
Don't generate or send if not in sight Don't generate or send if not in sight
*/ */
if(isBlockInSight(p, camera_pos, camera_dir, M_PI, 10000*BS) == false) if(isBlockInSight(p, camera_pos, camera_dir, PI, 10000*BS) == false)
{ {
continue; continue;
} }