Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Sommersemester 2015
Cpp
Deth Buff Arr
Commits
466f8bdc
Commit
466f8bdc
authored
Sep 27, 2015
by
Elias Broschin
Browse files
portals cancelled abort mission
parent
792b7d27
Changes
1
Show whitespace changes
Inline
Side-by-side
src/gameplay/game_input_manager.cpp
View file @
466f8bdc
...
...
@@ -116,12 +116,10 @@ namespace gdw {
if
(
input
.
mouseWheelY
()
<
0.
f
)
{
auto
cam
=
engine_
.
game_play_system
().
level_manager
().
camera
();
cam
->
position
(
cam
->
position
()
+
glm
::
vec3
(
0
,
1.
f
,
1.
f
));
level_manager
.
set_weapon
(
weapon_type
::
tractor_beam
);
}
if
(
input
.
mouseWheelY
()
>
0.
f
)
{
auto
cam
=
engine_
.
game_play_system
().
level_manager
().
camera
();
cam
->
position
(
cam
->
position
()
+
glm
::
vec3
(
0
,
-
1.
f
,
-
1.
f
));
level_manager
.
set_weapon
(
weapon_type
::
portal_gun
);
}
if
(
input
.
isPressed
(
inputMaping
::
beam_normal
))
{
...
...
@@ -251,7 +249,6 @@ namespace gdw {
if
(
!
type_comp
)
continue
;
if
(
type_comp
->
get_object_type
()
==
"ACCELERATOR"
)
{
ray_length_
=
asteroid_hit
?
ray_length_
:
ray_length_
*
1.5
f
;
beam_velocity
+=
10.
f
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment