Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
PhaseShifter
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
S
Sommersemester 2019
Cpp
PhaseShifter
Commits
16a597d3
Commit
16a597d3
authored
Sep 18, 2019
by
Georg Schäfer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add rigid body component.
parent
a5556908
Pipeline
#3257
failed with stage
in 2 minutes and 10 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
53 additions
and
5 deletions
+53
-5
assets/game_assets/blueprints/player.json
assets/game_assets/blueprints/player.json
+11
-5
src/gameplay/rigid_body_comp.cpp
src/gameplay/rigid_body_comp.cpp
+1
-0
src/gameplay/rigid_body_comp.hpp
src/gameplay/rigid_body_comp.hpp
+14
-0
src/level/level_system.cpp
src/level/level_system.cpp
+23
-0
src/level/level_system.hpp
src/level/level_system.hpp
+3
-0
src/meta_system.cpp
src/meta_system.cpp
+1
-0
No files found.
assets/game_assets/blueprints/player.json
View file @
16a597d3
{
"Transform"
:{
"scale"
:
{
"x"
:
0.5
,
"y"
:
0.5
,
"z"
:
0.5
}
"Transform"
:
{
"scale"
:
{
"x"
:
0.5
,
"y"
:
0.5
,
"z"
:
0.5
}
},
"Model"
:
{
"aid"
:
"model:cube"
},
"Shadowcaster"
:
{
},
"Shadowcaster"
:
{},
"Movement"
:
{
"beats_per_step"
:
1
,
"distance_per_step"
:
1
,
...
...
@@ -14,5 +17,8 @@
"off_beat_threshold"
:
0.2
},
"Input_controller"
:
{},
"Player"
:
{}
"Player"
:
{},
"Rigid_body"
:
{
"radius"
:
1.0
}
}
src/gameplay/rigid_body_comp.cpp
0 → 100644
View file @
16a597d3
#include "rigid_body_comp.hpp"
src/gameplay/rigid_body_comp.hpp
0 → 100644
View file @
16a597d3
#pragma once
#include <mirrage/ecs/ecs.hpp>
namespace
phase_shifter
::
gameplay
{
struct
Rigid_body_comp
:
public
mirrage
::
ecs
::
Component
<
Rigid_body_comp
>
{
static
constexpr
const
char
*
name
()
{
return
"Rigid_body"
;
}
using
Component
::
Component
;
float
radius
;
};
sf2_structDef
(
Rigid_body_comp
,
radius
);
}
// namespace phase_shifter::gameplay
src/level/level_system.cpp
View file @
16a597d3
#include "level_system.hpp"
#include "../gameplay/movement_comp.hpp"
#include "../gameplay/player_comp.hpp"
#include "../gameplay/rigid_body_comp.hpp"
#include "../gameplay/viewtarget_comp.hpp"
#include <mirrage/ecs/components/transform_comp.hpp>
...
...
@@ -12,6 +15,8 @@ namespace phase_shifter::level {
Level_system
::
Level_system
(
mirrage
::
ecs
::
Entity_manager
&
entities
,
mirrage
::
asset
::
Asset_manager
&
assets
)
:
_entities
(
entities
),
_assets
(
assets
)
{
_entities
.
register_component_type
<
gameplay
::
Rigid_body_comp
>
();
_spawners
.
emplace
(
"p"
,
[
&
](
const
Tile
&
tile
,
const
glm
::
vec3
&
position
)
{
mirrage
::
ecs
::
Entity_facet
player
=
_entities
.
entity_builder
(
tile
.
spawns
).
position
(
position
).
create
();
...
...
@@ -36,6 +41,24 @@ namespace phase_shifter::level {
});
}
auto
Level_system
::
update
(
const
mirrage
::
util
::
Time
&
time
)
->
void
{
for
(
auto
&&
[
player
,
movement
,
transform
,
rigid_body
]
:
_entities
.
list
<
gameplay
::
Player_comp
,
gameplay
::
Movement_comp
,
Transform_comp
,
gameplay
::
Rigid_body_comp
>
())
{
auto
origin
=
glm
::
vec2
{
transform
.
position
.
x
,
transform
.
position
.
z
};
auto
direction
=
glm
::
normalize
(
movement
.
aim
);
auto
[
hit
,
contact
]
=
ray_cast
(
origin
,
direction
);
if
(
!
hit
)
{
continue
;
}
if
(
contact
.
distance2
<=
rigid_body
.
radius
*
rigid_body
.
radius
)
{
movement
.
move
=
false
;
}
}
}
namespace
{
using
action
=
std
::
function
<
auto
(
const
Tileset
&
tileset
,
const
std
::
string
&
key
,
...
...
src/level/level_system.hpp
View file @
16a597d3
...
...
@@ -3,6 +3,8 @@
#include "../util/collision.hpp"
#include "level.hpp"
#include <mirrage/utils/units.hpp>
#include <functional>
#include <unordered_map>
...
...
@@ -21,6 +23,7 @@ namespace phase_shifter::level {
public:
Level_system
(
mirrage
::
ecs
::
Entity_manager
&
entities
,
mirrage
::
asset
::
Asset_manager
&
assets
);
auto
update
(
const
mirrage
::
util
::
Time
&
time
)
->
void
;
auto
load
(
const
std
::
string
&
name
)
->
void
;
auto
ray_cast
(
const
glm
::
vec2
&
origin
,
const
glm
::
vec2
&
direction
)
->
std
::
pair
<
bool
,
util
::
Contact
>
;
...
...
src/meta_system.cpp
View file @
16a597d3
...
...
@@ -107,6 +107,7 @@ namespace phase_shifter {
_beat_system
->
update
(
dt
);
_input_system
->
update
(
dt
);
_level_system
->
update
(
dt
);
_movement_system
->
update
(
dt
);
_combat_system
->
update
(
dt
);
_camera_system
->
update
(
dt
);
...
...
Write
Preview
Markdown
is supported
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