Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
illuna-minetest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Illuna-Minetest
illuna-minetest
Commits
500f6914
Commit
500f6914
authored
10 years ago
by
Zeno-
Browse files
Options
Downloads
Patches
Plain Diff
Fix regression (increase/decrease viewing range with +/- keys)
parent
2f134ce2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/camera.cpp
+2
-4
2 additions, 4 deletions
src/camera.cpp
src/camera.h
+0
-2
0 additions, 2 deletions
src/camera.h
with
2 additions
and
6 deletions
src/camera.cpp
+
2
−
4
View file @
500f6914
...
@@ -109,8 +109,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
...
@@ -109,8 +109,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
*/
*/
m_cache_fall_bobbing_amount
=
g_settings
->
getFloat
(
"fall_bobbing_amount"
);
m_cache_fall_bobbing_amount
=
g_settings
->
getFloat
(
"fall_bobbing_amount"
);
m_cache_view_bobbing_amount
=
g_settings
->
getFloat
(
"view_bobbing_amount"
);
m_cache_view_bobbing_amount
=
g_settings
->
getFloat
(
"view_bobbing_amount"
);
m_cache_viewing_range_min
=
g_settings
->
getFloat
(
"viewing_range_nodes_min"
);
m_cache_viewing_range_max
=
g_settings
->
getFloat
(
"viewing_range_nodes_max"
);
m_cache_wanted_fps
=
g_settings
->
getFloat
(
"wanted_fps"
);
m_cache_wanted_fps
=
g_settings
->
getFloat
(
"wanted_fps"
);
m_cache_fov
=
g_settings
->
getFloat
(
"fov"
);
m_cache_fov
=
g_settings
->
getFloat
(
"fov"
);
m_cache_view_bobbing
=
g_settings
->
getBool
(
"view_bobbing"
);
m_cache_view_bobbing
=
g_settings
->
getBool
(
"view_bobbing"
);
...
@@ -539,10 +537,10 @@ void Camera::updateViewingRange(f32 frametime_in, f32 busytime_in)
...
@@ -539,10 +537,10 @@ void Camera::updateViewingRange(f32 frametime_in, f32 busytime_in)
<<std::endl;*/
<<std::endl;*/
// Get current viewing range and FPS settings
// Get current viewing range and FPS settings
f32
viewing_range_min
=
m_cache_
viewing_range_min
;
f32
viewing_range_min
=
g_settings
->
getFloat
(
"
viewing_range_
nodes_
min
"
)
;
viewing_range_min
=
MYMAX
(
15.0
,
viewing_range_min
);
viewing_range_min
=
MYMAX
(
15.0
,
viewing_range_min
);
f32
viewing_range_max
=
m_cache_
viewing_range_max
;
f32
viewing_range_max
=
g_settings
->
getFloat
(
"
viewing_range_
nodes_
max
"
)
;
viewing_range_max
=
MYMAX
(
viewing_range_min
,
viewing_range_max
);
viewing_range_max
=
MYMAX
(
viewing_range_min
,
viewing_range_max
);
// Immediately apply hard limits
// Immediately apply hard limits
...
...
This diff is collapsed.
Click to expand it.
src/camera.h
+
0
−
2
View file @
500f6914
...
@@ -212,8 +212,6 @@ class Camera
...
@@ -212,8 +212,6 @@ class Camera
f32
m_cache_fall_bobbing_amount
;
f32
m_cache_fall_bobbing_amount
;
f32
m_cache_view_bobbing_amount
;
f32
m_cache_view_bobbing_amount
;
f32
m_cache_viewing_range_min
;
f32
m_cache_viewing_range_max
;
f32
m_cache_wanted_fps
;
f32
m_cache_wanted_fps
;
f32
m_cache_fov
;
f32
m_cache_fov
;
bool
m_cache_view_bobbing
;
bool
m_cache_view_bobbing
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment