Skip to content

Commit fc49e0d

Browse files
authored
Merge pull request #68 from YGNI-RType/dev
Release v0.4.0
2 parents f067605 + 6017265 commit fc49e0d

100 files changed

Lines changed: 3107 additions & 638 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ include(GNUInstallDirs)
66
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
77

88
include(cmake/automate-vcpkg.cmake)
9-
vcpkg_bootstrap()
10-
vcpkg_install_packages(raylib stduuid nlohmann-json portaudio opus bzip2)
9+
if (NOT DEFINED ENV{NOT_INSTALL_VCPKG})
10+
vcpkg_bootstrap()
11+
vcpkg_install_packages(raylib stduuid nlohmann-json portaudio opus bzip2)
12+
endif()
1113

1214
file(GLOB_RECURSE SOURCES source/*.cpp)
1315
list(FILTER SOURCES EXCLUDE REGEX ".*/deprecated/.*")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
props
1+
2.77 MB
Binary file not shown.

examples/POC_3D/include/components/Player.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#pragma once
99

1010
#include "GEngine/libdev/Component.hpp"
11-
#include <string>
1211

1312
#define DEFAULT_SPEED 0.06
1413

@@ -21,6 +20,7 @@ enum class PlayerState {
2120
struct Player : public gengine::Component<Player> {
2221
float speed;
2322
float defaultSpeed;
23+
bool isLocked = false;
2424

2525
Player(float defaultSpeed = DEFAULT_SPEED)
2626
: speed(defaultSpeed)
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
** EPITECH PROJECT, 2024
3+
** B-CPP-500-LYN-5-1-rtype-basile.fouquet
4+
** File description:
5+
** Prop.hpp
6+
*/
7+
8+
#pragma once
9+
10+
#include "GEngine/libdev/Component.hpp"
11+
12+
namespace poc3d::component {
13+
struct Prop : public gengine::Component<Prop> {};
14+
15+
} // namespace poc3d::component

examples/POC_3D/include/events/Jump.hpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,24 @@
88
#pragma once
99

1010
#include "GEngine/libdev/System.hpp"
11+
#include <stduuid/uuid.h>
1112

1213
namespace poc3d::event {
1314
struct Jump : public gengine::Event {
1415
float strength;
16+
uuids::uuid playerUuid = uuids::uuid{};
1517

1618
Jump(float strength = 0.1)
1719
: strength(strength) {
1820
}
21+
22+
Jump(double strength = 0.1)
23+
: strength(strength) {
24+
}
25+
26+
Jump(float strength = 0.1, uuids::uuid playerUuid = uuids::uuid{})
27+
: strength(strength)
28+
, playerUuid(playerUuid) {
29+
}
1930
};
2031
} // namespace poc3d::event
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
** EPITECH PROJECT, 2024
3+
** B-CPP-500-LYN-5-1-rtype-basile.fouquet
4+
** File description:
5+
** LockPlayerEvent.hpp
6+
*/
7+
8+
#pragma once
9+
10+
#include "GEngine/libdev/System.hpp"
11+
12+
namespace poc3d::event {
13+
struct LockPlayerEvent : public gengine::Event {
14+
bool locked;
15+
16+
LockPlayerEvent(bool locked)
17+
: locked(locked) {
18+
}
19+
};
20+
} // namespace poc3d::event
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
** EPITECH PROJECT, 2024
3+
** B-CPP-500-LYN-5-1-rtype-basile.fouquet
4+
** File description:
5+
** MorphToPropEvent.hpp
6+
*/
7+
8+
#pragma once
9+
10+
#include "GEngine/libdev/System.hpp"
11+
12+
namespace poc3d::event {
13+
struct MorphToPropEvent : public gengine::Event {};
14+
} // namespace poc3d::event
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
** EPITECH PROJECT, 2024
3+
** B-CPP-500-LYN-5-1-rtype-basile.fouquet
4+
** File description:
5+
** ResetPlayerRotationCameraEvent.hpp
6+
*/
7+
8+
#pragma once
9+
10+
#include "GEngine/libdev/System.hpp"
11+
12+
namespace poc3d::event {
13+
struct ResetPlayerRotationCameraEvent : public gengine::Event {};
14+
} // namespace poc3d::event
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
** EPITECH PROJECT, 2024
3+
** B-CPP-500-LYN-5-1-rtype-basile.fouquet
4+
** File description:
5+
** ResetPlayerRotationEvent.hpp
6+
*/
7+
8+
#pragma once
9+
10+
#include "GEngine/libdev/System.hpp"
11+
12+
namespace poc3d::event {
13+
struct ResetPlayerRotationEvent : public gengine::Event {
14+
float rotation;
15+
16+
ResetPlayerRotationEvent(float rotation)
17+
: rotation(rotation) {
18+
}
19+
};
20+
} // namespace poc3d::event

0 commit comments

Comments
 (0)