benkyd/crumpet-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asdf

Browse Source
This commit is contained in:
Ben
2018-11-29 19:36:48 +00:00
parent 25baf06b3f
commit 30f0db641c
11 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeFiles/CMakeDirectoryInformation.cmake
View File

@@ -1,9 +1,9 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.12
# Generated by "Unix Makefiles" Generator, CMake Version 3.7
# Relative path conversion top directories.
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/ben/Programming/crumpet-engine")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/ben/Programming/crumpet-engine")
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/ben/Desktop/crumpet-engine")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/ben/Desktop/crumpet-engine")
# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)

47
CMakeFiles/Makefile.cmake
View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.12
# Generated by "Unix Makefiles" Generator, CMake Version 3.7
# The generator used is:
set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
@@ -7,31 +7,30 @@ set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
# The top level Makefile was generated from the following files:
set(CMAKE_MAKEFILE_DEPENDS
"CMakeCache.txt"
"CMakeFiles/3.12.3/CMakeCCompiler.cmake"
"CMakeFiles/3.12.3/CMakeCXXCompiler.cmake"
"CMakeFiles/3.12.3/CMakeSystem.cmake"
"CMakeFiles/3.7.2/CMakeCCompiler.cmake"
"CMakeFiles/3.7.2/CMakeCXXCompiler.cmake"
"CMakeFiles/3.7.2/CMakeSystem.cmake"
"CMakeFiles/FindSDL2_image.cmake"
"CMakeLists.txt"
"/usr/lib/x86_64-linux-gnu/cmake/SDL2/sdl2-config.cmake"
"/usr/share/cmake-3.12/Modules/CMakeCInformation.cmake"
"/usr/share/cmake-3.12/Modules/CMakeCXXInformation.cmake"
"/usr/share/cmake-3.12/Modules/CMakeCommonLanguageInclude.cmake"
"/usr/share/cmake-3.12/Modules/CMakeGenericSystem.cmake"
"/usr/share/cmake-3.12/Modules/CMakeInitializeConfigs.cmake"
"/usr/share/cmake-3.12/Modules/CMakeLanguageInformation.cmake"
"/usr/share/cmake-3.12/Modules/CMakeSystemSpecificInformation.cmake"
"/usr/share/cmake-3.12/Modules/CMakeSystemSpecificInitialize.cmake"
"/usr/share/cmake-3.12/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
"/usr/share/cmake-3.12/Modules/Compiler/GNU-C.cmake"
"/usr/share/cmake-3.12/Modules/Compiler/GNU-CXX.cmake"
"/usr/share/cmake-3.12/Modules/Compiler/GNU.cmake"
"/usr/share/cmake-3.12/Modules/FindPackageHandleStandardArgs.cmake"
"/usr/share/cmake-3.12/Modules/FindPackageMessage.cmake"
"/usr/share/cmake-3.12/Modules/Platform/Linux-GNU-C.cmake"
"/usr/share/cmake-3.12/Modules/Platform/Linux-GNU-CXX.cmake"
"/usr/share/cmake-3.12/Modules/Platform/Linux-GNU.cmake"
"/usr/share/cmake-3.12/Modules/Platform/Linux.cmake"
"/usr/share/cmake-3.12/Modules/Platform/UnixPaths.cmake"
"/usr/lib/i386-linux-gnu/cmake/SDL2/sdl2-config.cmake"
"/usr/share/cmake-3.7/Modules/CMakeCInformation.cmake"
"/usr/share/cmake-3.7/Modules/CMakeCXXInformation.cmake"
"/usr/share/cmake-3.7/Modules/CMakeCommonLanguageInclude.cmake"
"/usr/share/cmake-3.7/Modules/CMakeGenericSystem.cmake"
"/usr/share/cmake-3.7/Modules/CMakeLanguageInformation.cmake"
"/usr/share/cmake-3.7/Modules/CMakeParseArguments.cmake"
"/usr/share/cmake-3.7/Modules/CMakeSystemSpecificInformation.cmake"
"/usr/share/cmake-3.7/Modules/CMakeSystemSpecificInitialize.cmake"
"/usr/share/cmake-3.7/Modules/Compiler/GNU-C.cmake"
"/usr/share/cmake-3.7/Modules/Compiler/GNU-CXX.cmake"
"/usr/share/cmake-3.7/Modules/Compiler/GNU.cmake"
"/usr/share/cmake-3.7/Modules/FindPackageHandleStandardArgs.cmake"
"/usr/share/cmake-3.7/Modules/FindPackageMessage.cmake"
"/usr/share/cmake-3.7/Modules/Platform/Linux-GNU-C.cmake"
"/usr/share/cmake-3.7/Modules/Platform/Linux-GNU-CXX.cmake"
"/usr/share/cmake-3.7/Modules/Platform/Linux-GNU.cmake"
"/usr/share/cmake-3.7/Modules/Platform/Linux.cmake"
"/usr/share/cmake-3.7/Modules/Platform/UnixPaths.cmake"
)
# The corresponding makefile is:

17
CMakeFiles/Makefile2
View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.12
# Generated by "Unix Makefiles" Generator, CMake Version 3.7
# Default target executed when no arguments are given to make.
default_target: all
@@ -16,11 +16,6 @@ preinstall:
.PHONY : preinstall
# The main recursive clean target
clean:
.PHONY : clean
#=============================================================================
# Special targets provided by cmake.
@@ -59,10 +54,10 @@ RM = /usr/bin/cmake -E remove -f
EQUALS = =
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/ben/Programming/crumpet-engine
CMAKE_SOURCE_DIR = /home/ben/Desktop/crumpet-engine
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /home/ben/Programming/crumpet-engine
CMAKE_BINARY_DIR = /home/ben/Desktop/crumpet-engine
#=============================================================================
# Target rules for target CMakeFiles/bin/crumpet-engine.dir
@@ -71,7 +66,7 @@ CMAKE_BINARY_DIR = /home/ben/Programming/crumpet-engine
CMakeFiles/bin/crumpet-engine.dir/all:
$(MAKE) -f CMakeFiles/bin/crumpet-engine.dir/build.make CMakeFiles/bin/crumpet-engine.dir/depend
$(MAKE) -f CMakeFiles/bin/crumpet-engine.dir/build.make CMakeFiles/bin/crumpet-engine.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/ben/Programming/crumpet-engine/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12 "Built target bin/crumpet-engine"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/ben/Desktop/crumpet-engine/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12 "Built target bin/crumpet-engine"
.PHONY : CMakeFiles/bin/crumpet-engine.dir/all
# Include target in all.
@@ -81,9 +76,9 @@ all: CMakeFiles/bin/crumpet-engine.dir/all
# Build rule for subdir invocation for target.
CMakeFiles/bin/crumpet-engine.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /home/ben/Programming/crumpet-engine/CMakeFiles 12
$(CMAKE_COMMAND) -E cmake_progress_start /home/ben/Desktop/crumpet-engine/CMakeFiles 12
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/bin/crumpet-engine.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/ben/Programming/crumpet-engine/CMakeFiles 0
$(CMAKE_COMMAND) -E cmake_progress_start /home/ben/Desktop/crumpet-engine/CMakeFiles 0
.PHONY : CMakeFiles/bin/crumpet-engine.dir/rule
# Convenience name for target.

6
CMakeFiles/TargetDirectories.txt
View File

@@ -1,3 +1,3 @@
/home/ben/Programming/crumpet-engine/CMakeFiles/rebuild_cache.dir
/home/ben/Programming/crumpet-engine/CMakeFiles/bin/crumpet-engine.dir
/home/ben/Programming/crumpet-engine/CMakeFiles/edit_cache.dir
/home/ben/Desktop/crumpet-engine/CMakeFiles/rebuild_cache.dir
/home/ben/Desktop/crumpet-engine/CMakeFiles/edit_cache.dir
/home/ben/Desktop/crumpet-engine/CMakeFiles/bin/crumpet-engine.dir

2
CMakeLists.txt
View File

@@ -1,5 +1,5 @@
# version
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.7)
project(crumpet-engine)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} CMakeFiles/)

7
TODO.txt
View File

@@ -8,4 +8,9 @@ x -> complete
[ ]
**TODO**
[ ] Comment the code
[-] Comment the code
[ ] Entity system
[ ] Entity manager
[ ] Ability to make entities and manage textures between them
[ ] Entity base class
[ ] Entity class

BIN
bin/crumpet-engine
View File

Binary file not shown.

4
src/crumpet-engine/entitymanager/entitybase.h
View File

@@ -1,8 +1,12 @@
#pragma once
#include <string>
class EntityBase {
public:
EntityBase();
std::string texture;
virtual ~EntityBase();
};

3
src/crumpet-engine/entitymanager/entitymanager.cpp
View File

@@ -1,6 +1,7 @@
#include "entitymanager.h"
EntityManager::EntityManager() {
EntityManager::EntityManager(ResourceManger* resourceManger)
: resourceManger(resourceManger) {
}

8
src/crumpet-engine/entitymanager/entitymanager.h
View File

@@ -4,12 +4,16 @@
#include <map>
#include "entity.h"
#include "../resourcemanager/resourcemanager.h"
class EntityManager {
public:
EntityManager();
EntityManager(ResourceManger* resourceManager);
virtual ~EntityManager();
private:
std::map<std::string, Entity> m_activeEntities;
std::map<unsigned short int, Entity> m_activeEntities;
ResourceManger* resourceManger;
};

2
src/crumpet-engine/game.cpp
View File

@@ -4,7 +4,7 @@ Game::Game()
: input(&renderer)
, resourceManager(&renderer)
, textureManager(resourceManager.textureManager)
, entityManager() {
, entityManager(&resourceManager) {
}