Renamed the widgets project to a folder structure project. Also structured the files into folders.

This commit is contained in:
Relintai 2021-04-15 00:57:41 +02:00
parent 894687ed06
commit 664e4206ed
45 changed files with 74 additions and 74 deletions

View File

@ -1,6 +1,6 @@
#include "application.h"
#include "renderer.h"
#include "renderer/renderer.h"
Application* Application::_instance = nullptr;

View File

@ -0,0 +1,42 @@
if [ ! -d "obj" ]; then
mkdir obj
fi
if [ ! -d "bin" ]; then
mkdir bin
fi
#-Iinclude
#g++ -Wall -g -c vector2.cpp -o obj/vector2.o
#g++ -Wall -g -c vector3.cpp -o obj/vector3.o
#g++ -Wall -g -c int_vector.cpp -o obj/int_vector.o
g++ -Wall -g -I. -c core/math.cpp -o obj/math.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c core/rect2.cpp -o obj/rect2.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c core/color.cpp -o obj/color.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c core/vector2.cpp -o obj/vector2.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c core/vector3.cpp -o obj/vector3.o
g++ -Wall -g -I. -c core/string.cpp -o obj/string.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/renderer.cpp -o obj/renderer.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/image.cpp -o obj/image.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/texture.cpp -o obj/texture.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/sprite.cpp -o obj/sprite.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/camera.cpp -o obj/camera.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/text_image.cpp -o obj/text_image.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/text_sprite.cpp -o obj/text_sprite.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/true_type_font.cpp -o obj/true_type_font.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c renderer/button.cpp -o obj/button.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c scene.cpp -o obj/scene.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c application.cpp -o obj/application.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c main_scene.cpp -o obj/main_scene.o
g++ -Wall -g $(sdl2-config --cflags) -I. -c main.cpp -o obj/main.o
g++ -o bin/program obj/math.o obj/rect2.o obj/color.o obj/vector2.o obj/vector3.o obj/string.o obj/renderer.o obj/image.o obj/texture.o obj/sprite.o obj/camera.o obj/text_image.o obj/text_sprite.o obj/true_type_font.o obj/button.o obj/scene.o obj/application.o obj/main_scene.o obj/main.o $(sdl2-config --libs) -lSDL2_ttf

View File

@ -5,7 +5,7 @@
#include <SDL_ttf.h>
#include "application.h"
#include "renderer.h"
#include "renderer/renderer.h"
#include "impl_application.h"
#define APPLICATION_CLASS ImplApplication

View File

@ -1,7 +1,7 @@
#include "main_scene.h"
#include "rect2.h"
#include "renderer.h"
#include "core/rect2.h"
#include "renderer/renderer.h"
#include <SDL.h>

View File

@ -3,14 +3,14 @@
#include "scene.h"
#include "image.h"
#include "texture.h"
#include "sprite.h"
#include "camera.h"
#include "button.h"
#include "true_type_font.h"
#include "text_image.h"
#include "text_sprite.h"
#include "renderer/image.h"
#include "renderer/texture.h"
#include "renderer/sprite.h"
#include "renderer/camera.h"
#include "renderer/button.h"
#include "renderer/true_type_font.h"
#include "renderer/text_image.h"
#include "renderer/text_sprite.h"
class MainScene : public Scene {
public:

View File

@ -4,7 +4,7 @@
#include <SDL.h>
#include "rect2.h"
#include "core/rect2.h"
#include "sprite.h"
#include <functional>

View File

@ -3,7 +3,7 @@
#include <SDL.h>
#include "rect2.h"
#include "core/rect2.h"
class Camera {
public:

View File

@ -1,10 +1,10 @@
#ifndef IMAGE_H
#define IMAGE_H
#include "color.h"
#include "rect2.h"
#include "string.h"
#include "vector.h"
#include "core/color.h"
#include "core/rect2.h"
#include "core/string.h"
#include "core/vector.h"
#include <SDL.h>
class Image {

View File

@ -2,7 +2,7 @@
#include <cstdio>
#include "math.h"
#include "core/math.h"
void Renderer::present() {
SDL_RenderPresent(_renderer);

View File

@ -1,8 +1,8 @@
#ifndef RENDERER_H
#define RENDERER_H
#include "color.h"
#include "rect2.h"
#include "core/color.h"
#include "core/rect2.h"
#include "sprite.h"
#include "texture.h"

View File

@ -3,9 +3,9 @@
#include <SDL.h>
#include "rect2.h"
#include "core/rect2.h"
#include "texture.h"
#include "color.h"
#include "core/color.h"
class Sprite {
public:

View File

@ -3,11 +3,11 @@
#include <SDL.h>
#include "color.h"
#include "core/color.h"
#include "image.h"
#include "string.h"
#include "core/string.h"
#include "true_type_font.h"
#include "vector2.h"
#include "core/vector2.h"
class TextImage {
public:

View File

@ -5,11 +5,11 @@
#include "sprite.h"
#include "color.h"
#include "core/color.h"
#include "image.h"
#include "string.h"
#include "core/string.h"
#include "true_type_font.h"
#include "vector2.h"
#include "core/vector2.h"
#include "text_image.h"
class TextSprite : public Sprite {

View File

@ -4,9 +4,9 @@
#include <SDL.h>
#include <SDL_ttf.h>
#include "color.h"
#include "string.h"
#include "vector2.h"
#include "core/color.h"
#include "core/string.h"
#include "core/vector2.h"
#include "image.h"
class TrueTypeFont {

View File

Before

Width:  |  Height:  |  Size: 792 KiB

After

Width:  |  Height:  |  Size: 792 KiB

View File

@ -1,42 +0,0 @@
if [ ! -d "obj" ]; then
mkdir obj
fi
if [ ! -d "bin" ]; then
mkdir bin
fi
#-Iinclude
#g++ -Wall -g -c vector2.cpp -o obj/vector2.o
#g++ -Wall -g -c vector3.cpp -o obj/vector3.o
#g++ -Wall -g -c int_vector.cpp -o obj/int_vector.o
g++ -Wall -g -c math.cpp -o obj/math.o
g++ -Wall -g $(sdl2-config --cflags) -c rect2.cpp -o obj/rect2.o
g++ -Wall -g $(sdl2-config --cflags) -c color.cpp -o obj/color.o
g++ -Wall -g $(sdl2-config --cflags) -c vector2.cpp -o obj/vector2.o
g++ -Wall -g $(sdl2-config --cflags) -c vector3.cpp -o obj/vector3.o
g++ -Wall -g -c string.cpp -o obj/string.o
g++ -Wall -g $(sdl2-config --cflags) -c renderer.cpp -o obj/renderer.o
g++ -Wall -g $(sdl2-config --cflags) -c image.cpp -o obj/image.o
g++ -Wall -g $(sdl2-config --cflags) -c texture.cpp -o obj/texture.o
g++ -Wall -g $(sdl2-config --cflags) -c sprite.cpp -o obj/sprite.o
g++ -Wall -g $(sdl2-config --cflags) -c camera.cpp -o obj/camera.o
g++ -Wall -g $(sdl2-config --cflags) -c text_image.cpp -o obj/text_image.o
g++ -Wall -g $(sdl2-config --cflags) -c text_sprite.cpp -o obj/text_sprite.o
g++ -Wall -g $(sdl2-config --cflags) -c true_type_font.cpp -o obj/true_type_font.o
g++ -Wall -g $(sdl2-config --cflags) -c button.cpp -o obj/button.o
g++ -Wall -g $(sdl2-config --cflags) -c scene.cpp -o obj/scene.o
g++ -Wall -g $(sdl2-config --cflags) -c application.cpp -o obj/application.o
g++ -Wall -g $(sdl2-config --cflags) -c main_scene.cpp -o obj/main_scene.o
g++ -Wall -g $(sdl2-config --cflags) -c main.cpp -o obj/main.o
g++ -o bin/program obj/math.o obj/rect2.o obj/color.o obj/vector2.o obj/vector3.o obj/string.o obj/renderer.o obj/image.o obj/texture.o obj/sprite.o obj/camera.o obj/text_image.o obj/text_sprite.o obj/true_type_font.o obj/button.o obj/scene.o obj/application.o obj/main_scene.o obj/main.o $(sdl2-config --libs) -lSDL2_ttf