Relintai/sfw
1
0
Fork 0
mirror of https://github.com/Relintai/sfw.git synced 2024-11-08 07:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added more classes to the build.

Browse Source
This commit is contained in:
Relintai 2023-12-19 19:39:36 +01:00
parent 663c551d14
commit 0da5c5e530
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compile_linux.sh
View File

@ -48,6 +48,10 @@ ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/shad
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/material.cpp -o sfw/application/material.o ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/material.cpp -o sfw/application/material.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/mesh.cpp -o sfw/application/mesh.o ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/mesh.cpp -o sfw/application/mesh.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/camera.cpp -o sfw/application/camera.o ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/camera.cpp -o sfw/application/camera.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/mesh_instance.cpp -o sfw/application/mesh_instance.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/object_2d.cpp -o sfw/application/object_2d.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/sprite.cpp -o sfw/application/sprite.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/tile_map.cpp -o sfw/application/tile_map.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c game_scene.cpp -o game_scene.o ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c game_scene.cpp -o game_scene.o
ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c main.cpp -o main.o ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c main.cpp -o main.o
@ -60,7 +64,8 @@ ccache g++ -Wall -lm -ldl -lpthread -lX11 -D_REENTRANT -g sfw/aabb.o sfw/basis.
sfw/pool_vector.o sfw/pool_allocator.o sfw/mutex.o sfw/stime.o \ sfw/pool_vector.o sfw/pool_allocator.o sfw/mutex.o sfw/stime.o \
sfw/application/application.o sfw/application/scene.o sfw/application/window.o \ sfw/application/application.o sfw/application/scene.o sfw/application/window.o \
sfw/application/shader.o sfw/application/material.o sfw/application/mesh.o \ sfw/application/shader.o sfw/application/material.o sfw/application/mesh.o \
sfw/application/camera.o \ sfw/application/camera.o sfw/application/mesh_instance.o sfw/application/object_2d.o \
sfw/application/sprite.o sfw/application/tile_map.o \
game_scene.o main.o \ game_scene.o main.o \
-o game -o game

2
sfw/application/object_2d.h
View File

@ -1,7 +1,7 @@
#ifndef OBJECT_2D_H #ifndef OBJECT_2D_H
#define OBJECT_2D_H #define OBJECT_2D_H
#include "./libs/glm/vec2.hpp" #include "../../libs/glm/vec2.hpp"
class Object2D { class Object2D {
public: public:

8
sfw/application/tile_map.cpp
View File

@ -1,8 +1,8 @@
#include "tile_map.h" #include "tile_map.h"
#include "./glm/gtc/matrix_transform.hpp" #include "../../libs/glm/gtc/matrix_transform.hpp"
#include "./glm/matrix.hpp" #include "../../libs/glm/matrix.hpp"
#include "./glm/vec3.hpp" #include "../../libs/glm/vec3.hpp"
#include "camera.h" #include "camera.h"
@ -73,7 +73,7 @@ void TileMap::allocate_data() {
} }
void TileMap::add_rect(const int x, const int y, const float uv_x, const float uv_y, const float uv_size_x, const float uv_size_y) { void TileMap::add_rect(const int x, const int y, const float uv_x, const float uv_y, const float uv_size_x, const float uv_size_y) {
int vc = static_cast<int>(mesh->vertices.size() / mesh->vertex_dimensions); int vc = static_cast<int>(mesh->vertices.size() / mesh->vertex_dimesions);
mesh->add_uv(uv_x, uv_y); mesh->add_uv(uv_x, uv_y);
mesh->add_vertex2(x, y + 1); mesh->add_vertex2(x, y + 1);