From fc01a2994de0aa91b511d2940a746473a221a571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9au?= <theau.baton@etu.univ-amu.fr>
Date: Tue, 29 Oct 2024 17:30:39 +0100
Subject: [PATCH] Update README.md
---
README.md | 6 ++++-
assets/images/Screenshot_1.png | Bin 0 -> 5923 bytes
source/main.cpp | 43 ++++++++++++++++++++++++++-------
3 files changed, 39 insertions(+), 10 deletions(-)
create mode 100644 assets/images/Screenshot_1.png
diff --git a/README.md b/README.md
index 5ad6b66..e621f4f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,11 @@
## Images
-[Screen_shot_0](assets/images/Screenshot_0.png)
+<p float="left">
+ <img src="assets/images/Screenshot_0.png" width="280" />
+ <img src="assets/images/Screenshot_1.png" width="280" />
+</p>
+
## Building
diff --git a/assets/images/Screenshot_1.png b/assets/images/Screenshot_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6e94ab13b545f3715c4738c99da6fe35b83bf2b
GIT binary patch
literal 5923
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
Cn$Cd$
literal 0
HcmV?d00001
diff --git a/source/main.cpp b/source/main.cpp
index 1a7e290..71c6376 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, const char * argv[]) {
std::cout << "Group Inited" << std::endl;
//? Image 1
- std::vector<int> map = {
+ /*std::vector<int> map = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 3, 3, 0, 0, 0, 0,
0, 0, 0, 3, 2, 2, 3, 0, 0, 0,
@@ -57,6 +57,24 @@ int main(int argc, const char * argv[]) {
0, 0, 1, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ };*/
+
+ std::vector<int> map = {
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 2, 0, 0, 1, 1, 1, 0, 0, 2, 0, 0, 0,
+ 0, 0, 0, 2, 0, 0, 1, 1, 1, 0, 0, 2, 0, 0, 0,
+ 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0,
+ 2, 0, 0, 1, 3, 1, 1, 2, 1, 1, 3, 1, 0, 0, 2,
+ 2, 0, 0, 3, 1, 1, 2, 2, 2, 1, 1, 3, 0, 0, 2,
+ 1, 0, 0, 1, 1, 1, 2, 1, 2, 1, 1, 1, 0, 0, 1,
+ 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
+ 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 2, 2, 1, 1, 1, 2, 2, 0, 1, 1, 1,
+ 1, 1, 0, 0, 2, 2, 0, 1, 0, 2, 2, 0, 0, 1, 1,
+ 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1,
};
size_t x = 0;
@@ -64,17 +82,20 @@ int main(int argc, const char * argv[]) {
std::vector<std::unique_ptr<megu::Image>> images;
+ megu::Texture texture_0;
+ texture_0.store(megu::TextureBuffer("assets/textures/Cube_White.png"));
+
megu::Texture texture_1;
- texture_1.store(megu::TextureBuffer("assets/textures/Cube_GLab_1.png"));
+ texture_1.store(megu::TextureBuffer("assets/textures/Cube_White.png"));
megu::Texture texture_2;
- texture_2.store(megu::TextureBuffer("assets/textures/Cube_GLab_2.png"));
+ texture_2.store(megu::TextureBuffer("assets/textures/Cube_Red.png"));
megu::Texture texture_3;
- texture_3.store(megu::TextureBuffer("assets/textures/Cube_GLab_3.png"));
+ texture_3.store(megu::TextureBuffer("assets/textures/Cube_Blue.png"));
for(auto id : map) {
- if(x == 10) {
+ if(x == 15) {
x = 0;
++y;
}
@@ -93,11 +114,15 @@ int main(int argc, const char * argv[]) {
case 3:
images.push_back(std::make_unique<megu::Image>(texture_3));
break;
+
+ default:
+ images.push_back(std::make_unique<megu::Image>(texture_0));
+ break;
}
- glm::vec2 pos = to_screen_coordinate({x, y}, 32.f, 32.f, 1.f);
+ glm::vec2 pos = to_screen_coordinate({x, y}, 32.f, 32.f, 0.f);
- images.back()->setPosition({pos.x + window.width()/2 - 16.f, pos.y + window.height()/4});
+ images.back()->setPosition({pos.x + window.width()/2 + 24.f, pos.y + window.height()/8});
}
++x;
@@ -163,8 +188,8 @@ int main(int argc, const char * argv[]) {
engine.push(0, basic_renderer);
- engine.push(0, 1, group);
- engine.push(0, 0, group_2);
+ engine.push(0, 0, group);
+ //engine.push(0, 0, group_2);
//? Render Loop
std::cout << "Render Loop Begin !" << std::endl;
--
GitLab