Skip to content

Commit

Permalink
merged dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Arroganz committed Feb 3, 2018
2 parents cf9f5cb + a343f4d commit 651a0f6
Show file tree
Hide file tree
Showing 16 changed files with 149 additions and 244 deletions.
2 changes: 1 addition & 1 deletion projects/fender/demo/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include_directories(
${FENDER_ROOT}/src
${PROJECT_SOURCE_DIR}/utils
include
src)
src ../include)

set_target_properties(demoExe PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${DEMO_ROOT})

Expand Down
8 changes: 7 additions & 1 deletion projects/fender/demo/cmake-build-debug/CMakeCache.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump

//Value Computed by CMake
CMAKE_PROJECT_NAME:STATIC=demo
CMAKE_PROJECT_NAME:STATIC=Project

//Path to a program.
CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
Expand Down Expand Up @@ -194,6 +194,12 @@ ProcessorCount_cmd_getconf:FILEPATH=/usr/bin/getconf
//Path to a program.
ProcessorCount_cmd_sysctl:FILEPATH=/usr/bin/sysctl

//Value Computed by CMake
Project_BINARY_DIR:STATIC=/home/arroganz/cpp/futils/projects/fender/demo/cmake-build-debug

//Value Computed by CMake
Project_SOURCE_DIR:STATIC=/home/arroganz/cpp/futils/projects/fender/demo

//Value Computed by CMake
demo_BINARY_DIR:STATIC=/home/arroganz/cpp/futils/projects/fender/demo/cmake-build-debug

Expand Down
4 changes: 2 additions & 2 deletions projects/fender/demo/cmake-build-debug/CMakeFiles/Makefile2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ CMAKE_BINARY_DIR = /home/arroganz/cpp/futils/projects/fender/demo/cmake-build-de
CMakeFiles/demoExe.dir/all:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/depend
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/arroganz/cpp/futils/projects/fender/demo/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10 "Built target demoExe"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/arroganz/cpp/futils/projects/fender/demo/cmake-build-debug/CMakeFiles --progress-num=1,2,3 "Built target demoExe"
.PHONY : CMakeFiles/demoExe.dir/all

# Include target in all.
Expand All @@ -76,7 +76,7 @@ all: CMakeFiles/demoExe.dir/all

# Build rule for subdir invocation for target.
CMakeFiles/demoExe.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /home/arroganz/cpp/futils/projects/fender/demo/cmake-build-debug/CMakeFiles 10
$(CMAKE_COMMAND) -E cmake_progress_start /home/arroganz/cpp/futils/projects/fender/demo/cmake-build-debug/CMakeFiles 3
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/demoExe.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/arroganz/cpp/futils/projects/fender/demo/cmake-build-debug/CMakeFiles 0
.PHONY : CMakeFiles/demoExe.dir/rule
Expand Down
2 changes: 1 addition & 1 deletion projects/fender/demo/cmake-build-debug/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
3
210 changes: 0 additions & 210 deletions projects/fender/demo/cmake-build-debug/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,195 +150,6 @@ src/App/App.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/App.cpp.s
.PHONY : src/App/App.cpp.s

src/App/Modules/AdvancedGUI.o: src/App/Modules/AdvancedGUI.cpp.o

.PHONY : src/App/Modules/AdvancedGUI.o

# target to build an object file
src/App/Modules/AdvancedGUI.cpp.o:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/AdvancedGUI.cpp.o
.PHONY : src/App/Modules/AdvancedGUI.cpp.o

src/App/Modules/AdvancedGUI.i: src/App/Modules/AdvancedGUI.cpp.i

.PHONY : src/App/Modules/AdvancedGUI.i

# target to preprocess a source file
src/App/Modules/AdvancedGUI.cpp.i:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/AdvancedGUI.cpp.i
.PHONY : src/App/Modules/AdvancedGUI.cpp.i

src/App/Modules/AdvancedGUI.s: src/App/Modules/AdvancedGUI.cpp.s

.PHONY : src/App/Modules/AdvancedGUI.s

# target to generate assembly for a file
src/App/Modules/AdvancedGUI.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/AdvancedGUI.cpp.s
.PHONY : src/App/Modules/AdvancedGUI.cpp.s

src/App/Modules/Collision.o: src/App/Modules/Collision.cpp.o

.PHONY : src/App/Modules/Collision.o

# target to build an object file
src/App/Modules/Collision.cpp.o:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Collision.cpp.o
.PHONY : src/App/Modules/Collision.cpp.o

src/App/Modules/Collision.i: src/App/Modules/Collision.cpp.i

.PHONY : src/App/Modules/Collision.i

# target to preprocess a source file
src/App/Modules/Collision.cpp.i:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Collision.cpp.i
.PHONY : src/App/Modules/Collision.cpp.i

src/App/Modules/Collision.s: src/App/Modules/Collision.cpp.s

.PHONY : src/App/Modules/Collision.s

# target to generate assembly for a file
src/App/Modules/Collision.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Collision.cpp.s
.PHONY : src/App/Modules/Collision.cpp.s

src/App/Modules/Grid.o: src/App/Modules/Grid.cpp.o

.PHONY : src/App/Modules/Grid.o

# target to build an object file
src/App/Modules/Grid.cpp.o:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Grid.cpp.o
.PHONY : src/App/Modules/Grid.cpp.o

src/App/Modules/Grid.i: src/App/Modules/Grid.cpp.i

.PHONY : src/App/Modules/Grid.i

# target to preprocess a source file
src/App/Modules/Grid.cpp.i:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Grid.cpp.i
.PHONY : src/App/Modules/Grid.cpp.i

src/App/Modules/Grid.s: src/App/Modules/Grid.cpp.s

.PHONY : src/App/Modules/Grid.s

# target to generate assembly for a file
src/App/Modules/Grid.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Grid.cpp.s
.PHONY : src/App/Modules/Grid.cpp.s

src/App/Modules/Loader.o: src/App/Modules/Loader.cpp.o

.PHONY : src/App/Modules/Loader.o

# target to build an object file
src/App/Modules/Loader.cpp.o:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Loader.cpp.o
.PHONY : src/App/Modules/Loader.cpp.o

src/App/Modules/Loader.i: src/App/Modules/Loader.cpp.i

.PHONY : src/App/Modules/Loader.i

# target to preprocess a source file
src/App/Modules/Loader.cpp.i:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Loader.cpp.i
.PHONY : src/App/Modules/Loader.cpp.i

src/App/Modules/Loader.s: src/App/Modules/Loader.cpp.s

.PHONY : src/App/Modules/Loader.s

# target to generate assembly for a file
src/App/Modules/Loader.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Loader.cpp.s
.PHONY : src/App/Modules/Loader.cpp.s

src/App/Modules/Menu.o: src/App/Modules/Menu.cpp.o

.PHONY : src/App/Modules/Menu.o

# target to build an object file
src/App/Modules/Menu.cpp.o:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Menu.cpp.o
.PHONY : src/App/Modules/Menu.cpp.o

src/App/Modules/Menu.i: src/App/Modules/Menu.cpp.i

.PHONY : src/App/Modules/Menu.i

# target to preprocess a source file
src/App/Modules/Menu.cpp.i:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Menu.cpp.i
.PHONY : src/App/Modules/Menu.cpp.i

src/App/Modules/Menu.s: src/App/Modules/Menu.cpp.s

.PHONY : src/App/Modules/Menu.s

# target to generate assembly for a file
src/App/Modules/Menu.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Menu.cpp.s
.PHONY : src/App/Modules/Menu.cpp.s

src/App/Modules/Runner.o: src/App/Modules/Runner.cpp.o

.PHONY : src/App/Modules/Runner.o

# target to build an object file
src/App/Modules/Runner.cpp.o:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Runner.cpp.o
.PHONY : src/App/Modules/Runner.cpp.o

src/App/Modules/Runner.i: src/App/Modules/Runner.cpp.i

.PHONY : src/App/Modules/Runner.i

# target to preprocess a source file
src/App/Modules/Runner.cpp.i:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Runner.cpp.i
.PHONY : src/App/Modules/Runner.cpp.i

src/App/Modules/Runner.s: src/App/Modules/Runner.cpp.s

.PHONY : src/App/Modules/Runner.s

# target to generate assembly for a file
src/App/Modules/Runner.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Runner.cpp.s
.PHONY : src/App/Modules/Runner.cpp.s

src/App/Modules/Text.o: src/App/Modules/Text.cpp.o

.PHONY : src/App/Modules/Text.o

# target to build an object file
src/App/Modules/Text.cpp.o:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Text.cpp.o
.PHONY : src/App/Modules/Text.cpp.o

src/App/Modules/Text.i: src/App/Modules/Text.cpp.i

.PHONY : src/App/Modules/Text.i

# target to preprocess a source file
src/App/Modules/Text.cpp.i:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Text.cpp.i
.PHONY : src/App/Modules/Text.cpp.i

src/App/Modules/Text.s: src/App/Modules/Text.cpp.s

.PHONY : src/App/Modules/Text.s

# target to generate assembly for a file
src/App/Modules/Text.cpp.s:
$(MAKE) -f CMakeFiles/demoExe.dir/build.make CMakeFiles/demoExe.dir/src/App/Modules/Text.cpp.s
.PHONY : src/App/Modules/Text.cpp.s

src/main.o: src/main.cpp.o

.PHONY : src/main.o
Expand Down Expand Up @@ -378,27 +189,6 @@ help:
@echo "... src/App/App.o"
@echo "... src/App/App.i"
@echo "... src/App/App.s"
@echo "... src/App/Modules/AdvancedGUI.o"
@echo "... src/App/Modules/AdvancedGUI.i"
@echo "... src/App/Modules/AdvancedGUI.s"
@echo "... src/App/Modules/Collision.o"
@echo "... src/App/Modules/Collision.i"
@echo "... src/App/Modules/Collision.s"
@echo "... src/App/Modules/Grid.o"
@echo "... src/App/Modules/Grid.i"
@echo "... src/App/Modules/Grid.s"
@echo "... src/App/Modules/Loader.o"
@echo "... src/App/Modules/Loader.i"
@echo "... src/App/Modules/Loader.s"
@echo "... src/App/Modules/Menu.o"
@echo "... src/App/Modules/Menu.i"
@echo "... src/App/Modules/Menu.s"
@echo "... src/App/Modules/Runner.o"
@echo "... src/App/Modules/Runner.i"
@echo "... src/App/Modules/Runner.s"
@echo "... src/App/Modules/Text.o"
@echo "... src/App/Modules/Text.i"
@echo "... src/App/Modules/Text.s"
@echo "... src/main.o"
@echo "... src/main.i"
@echo "... src/main.s"
Expand Down
Binary file added projects/fender/demo/ressources/spritesheet.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions projects/fender/demo/src/App/Modules/Loader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Created by arroganz on 1/23/18.
//

#include <Entities/Sprite.hpp>
#include "Components/rigidBody.hpp"
#include "Loader.hpp"
#include "Text.hpp"
Expand Down Expand Up @@ -71,6 +72,28 @@ namespace demo::systems
void Loader::loadExtensions() {
auto &rightContent = _rightFrame->get<fender::components::ListView>();
rightContent.order = futils::Ordering::Vertical;

auto &gui = _cam->get<fender::components::Children>();
auto *inputField = &entityManager->smartCreate<fender::entities::InputField>("placeholder");
gui.add(*inputField);
auto &inputInfos = inputField->get<fender::components::ChildInfo>();
inputInfos.relSize.w = 30;
inputInfos.relSize.h = 30;
inputInfos.offset.x = 50;
inputInfos.offset.y = 50;
inputField->setBorderVisible(true);

// auto *sprite = &entityManager->smartCreate<fender::entities::Sprite>(0.04, true);
// sprite->setBorderVisible(false);
// sprite->autoLoad("spritesheet.png", futils::Vec2<int>(4, 4), futils::Vec2<int>(128, 128));
// auto &spriteInfos = sprite->get<fender::components::ChildInfo>();
// spriteInfos.relSize.w = 30;
// spriteInfos.relSize.h = 30;
// spriteInfos.offset.x = 50;
// spriteInfos.offset.y = 50;



futils::Dir modules("./src/App/Extensions");
int found = 0;
for (auto &file: modules.getContent()) {
Expand Down
2 changes: 2 additions & 0 deletions projects/fender/src/Components/Image.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
namespace fender::components {
struct Image : futils::IComponent {
std::string file;
vec2i position{0, 0};
vec2i size{-1, -1};
};
}
25 changes: 22 additions & 3 deletions projects/fender/src/Components/Sprite.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,32 @@ namespace fender::components
{
class Sprite : public futils::IComponent {
public:
std::vector<std::string> files;
std::vector<futils::Image> files;
bool loop{true};
float speed{0.08};
unsigned int index{0};

void addSprite(std::string const &file) {
files.push_back(file);
void autoLoad(std::string const &file,
futils::Vec2<int> gridNbr,
futils::Vec2<int> gridSize)
{
int tmpX = 0;
int tmpY = 0;
while (tmpY < gridNbr.h) {
if (tmpX == gridNbr.w) {
tmpX = 0;
tmpY++;
} else {
addSprite(file, futils::Vec2<int>(tmpX * gridSize.w, gridSize.h * tmpY), gridSize);
tmpX++;
}
}
}

void addSprite(std::string const &file,
futils::Vec2<int> pos = futils::Vec2<int>(0, 0),
futils::Vec2<int> size = futils::Vec2<int>(-1, -1)) {
files.emplace_back(file, pos, size);
}
};
}
7 changes: 7 additions & 0 deletions projects/fender/src/Entities/InputField.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ namespace fender::entities {
};
_text = &attach<components::Text>();
_text->str = placeholder;
_text->style.font = "earthorbiter.ttf";
_text->style.size = 18;
_text->style.color = futils::White;

_inputs = &attach<components::Input>();
_inputs->activated = false;
_inputs->name = "SomeInputField";
Expand All @@ -111,6 +115,9 @@ namespace fender::entities {
}
for (auto &pair: advancedKeys) {
auto func = pair.second;
_inputs->map[futils::InputSequence(pair.first, futils::InputState::Down)] = [this, func](){
func(_text->str);
};
_inputs->map[futils::InputSequence(pair.first)] = [this, func](){
func(_text->str);
};
Expand Down

0 comments on commit 651a0f6

Please sign in to comment.