aslan/AsloEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Scene Loading and Program Settings

Browse source
This commit is contained in:
Aslan2142 2019-08-29 20:18:48 +02:00
parent 881e6c70f2
commit 1bad863c5b
13 changed files with 91 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
asloengine/builtin/assets/textures/texture_default_button.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

8
asloengine/builtin/grid_container.cpp
View file

@ -13,14 +13,6 @@ namespace asloengine
sf::Vector2f grid_anchor_position = get_position() - (get_origin() * to_vector2f(grid_size) * cell_size);
for (int x = 0; x < grid_size.x; x++)
{
for (int y = 0; y < grid_size.y; y++)
{
}
}
unsigned int x = 0;
unsigned int y = 0;

11
asloengine/builtin/scene_default.cpp
View file

@ -1,3 +1,6 @@
// This is only an Engine Testing Scene
// Please don't use this for your Game
#include "headers/scene_default.hpp"
namespace asloengine
@ -24,7 +27,7 @@ namespace asloengine
TextOnlyButton *tbtn1 = new TextOnlyButton("Exit Button", "Exit Game", button_font);
//tbtn1->set_position(100, 125);
TextObject *to1 = new TextObject("Info Text", "Aslo Engine v0.9.0 by Aslan2142", button_font);
TextObject *to1 = new TextObject("Info Text", "Aslo Engine Test", button_font);
//to1->set_position(630, 0);
//to1->set_origin(1, 0);
btn1->signal_on_clicked.connect_member(to1, &TextObject::set_text, sf::String("lulz"));
@ -61,8 +64,8 @@ namespace asloengine
gui_layer.emplace_back(toif);
gui_layer.emplace_back(sc1);*/
GridContainer *container = new GridContainer("cont1", sf::Vector2u(2, 2), sf::Vector2f(200, 150));
container->set_position(100, 200);
GridContainer *container = new GridContainer("cont1", sf::Vector2u(2, 2), sf::Vector2f(300, 150));
container->set_position(30, 200);
container->add_object(to1);
container->add_object(if2);
container->add_object(btn1);
@ -79,7 +82,7 @@ namespace asloengine
void SceneDefault::on_update(float delta_time)
{
move_camera(sf::Vector2f(1, 2));
//move_camera(sf::Vector2f(1, 2));
}