move playercontroller to entity
This commit is contained in:
parent
4484b381b8
commit
e0171963c5
@ -3,7 +3,7 @@ CXXFLAGS = -std=c++20 -Wall -Wextra -O2 -I.
|
|||||||
LDFLAGS = -lraylib -lboost_system -lpthread -lGL -lm -ldl -lrt -lX11
|
LDFLAGS = -lraylib -lboost_system -lpthread -lGL -lm -ldl -lrt -lX11
|
||||||
|
|
||||||
TARGET = game
|
TARGET = game
|
||||||
SOURCES = main.cpp PlayerController.cpp net/NetworkManager.cpp
|
SOURCES = main.cpp entity/player/PlayerController.cpp net/NetworkManager.cpp
|
||||||
OBJECTS = $(SOURCES:.cpp=.o)
|
OBJECTS = $(SOURCES:.cpp=.o)
|
||||||
|
|
||||||
all: $(TARGET)
|
all: $(TARGET)
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include "PlayerController.hpp"
|
#include "entity/player/PlayerController.hpp"
|
||||||
#include "net/NetworkManager.hpp"
|
#include "net/NetworkManager.hpp"
|
||||||
|
|
||||||
constexpr int WORLD_SIZE = 100;
|
constexpr int WORLD_SIZE = 100;
|
||||||
|
|||||||
@ -1,29 +0,0 @@
|
|||||||
{
|
|
||||||
"foo": {
|
|
||||||
"username": "foo",
|
|
||||||
"color": "orange",
|
|
||||||
"position": {
|
|
||||||
"X": -25.698553,
|
|
||||||
"Y": 4.9015007,
|
|
||||||
"Z": 39.29553
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sky": {
|
|
||||||
"username": "sky",
|
|
||||||
"color": "purple",
|
|
||||||
"position": {
|
|
||||||
"X": 5.9400105,
|
|
||||||
"Y": -0.055064563,
|
|
||||||
"Z": -3.896852
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"test": {
|
|
||||||
"username": "test",
|
|
||||||
"color": "red",
|
|
||||||
"position": {
|
|
||||||
"X": 2.1930797,
|
|
||||||
"Y": -0.08324346,
|
|
||||||
"Z": -1.550154
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user