UI Shop Buttons and Bar Resources

Needlesslord · Apr 16, 2020 · 70e90b6 · 70e90b6
1 parent 1624f6c
commit 70e90b6
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 16 deletions.
diff --git a/PaintWars/Project II Game/Game/textures/Barracks.png b/PaintWars/Project II Game/Game/textures/Barracks.png
diff --git a/PaintWars/Project II Game/Game/textures/PaintExtractor.png b/PaintWars/Project II Game/Game/textures/PaintExtractor.png
diff --git a/PaintWars/Project II Game/Game/textures/Spawner.png b/PaintWars/Project II Game/Game/textures/Spawner.png
diff --git a/PaintWars/Project II Game/Game/textures/TownHall.png b/PaintWars/Project II Game/Game/textures/TownHall.png
diff --git a/PaintWars/Project II Game/Game/textures/UI/UI_atlas.png b/PaintWars/Project II Game/Game/textures/UI/UI_atlas.png
diff --git a/PaintWars/Project II Game/Game/textures/WoodProducer.png b/PaintWars/Project II Game/Game/textures/WoodProducer.png
diff --git a/PaintWars/Project II Game/Game/textures/font_extra_small.png b/PaintWars/Project II Game/Game/textures/font_extra_small.png
diff --git a/PaintWars/Project II Game/Motor2D/GameScene.cpp b/PaintWars/Project II Game/Motor2D/GameScene.cpp
@@ -117,6 +117,12 @@ bool GameScene::Start()
 
 	//HUD - Bar
 	hudBarImage = App->gui->AddElement(GUItype::GUI_IMAGE, nullptr, { 15 , 5 }, { 0 , 0 }, false, true, { 0, 1353, 1250, 35 }, nullptr, nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS);
+	paintLabel = App->gui->AddElement(GUItype::GUI_LABEL, hudBarImage, { 100 , 10 }, { 2 , 0 }, false, true, { 0, 0, 0, 0 }, "0", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL);
+	woodLabel = App->gui->AddElement(GUItype::GUI_LABEL, hudBarImage, { 200 , 5 }, { 2 , 0 }, false, true, { 0, 0, 0, 0 }, "0", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL);
+	metalLabel = App->gui->AddElement(GUItype::GUI_LABEL, hudBarImage, { 300 , 5 }, { 2 , 0 }, false, true, { 0, 0, 0, 0 }, "0", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL);
+	titaniumLabel = App->gui->AddElement(GUItype::GUI_LABEL, hudBarImage, { 400 , 5 }, { 2 , 0 }, false, true, { 0, 0, 0, 0 }, "0", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL);
+	researchLabel = App->gui->AddElement(GUItype::GUI_LABEL, hudBarImage, { 500 , 5 }, { 2 , 0 }, false, true, { 0, 0, 0, 0 }, "0", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL);
+	entitiesLabel = App->gui->AddElement(GUItype::GUI_LABEL, hudBarImage, { 670 , 5 }, { 2 , 0 }, false, true, { 0, 0, 0, 0 }, "0", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL);
 
 	//HUD - Quests
 	questsImage = App->gui->AddElement(GUItype::GUI_IMAGE, nullptr, { 15 , 50 }, { 0 , 0 }, false, true, { 0, 1388, 263, 40 }, nullptr, nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS);
@@ -214,8 +220,17 @@ bool GameScene::Start()
 	noButton->click_rect = { 1437, 359, 166, 57 };
 
 	// Shop
-	shopImage = App->gui->AddElement(GUItype::GUI_IMAGE, nullptr, { 15 , 450 }, { 0 , 0 }, false, false, { 0, 1388, 263, 265 }, nullptr, nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS);
+	shopImage = App->gui->AddElement(GUItype::GUI_IMAGE, nullptr, { 15 , 450 }, { 0 , 0 }, false, false, { 263, 1551, 263, 265 }, nullptr, nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS);
 	shopLabel = App->gui->AddElement(GUItype::GUI_LABEL, shopImage, { 15 , 452 }, { 2 , 2 }, false, false, { 0, 0, 0, 0 }, "SHOP", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL_WHITE);
+	buyWoodProducerButton = App->gui->AddElement(GUItype::GUI_BUTTON, shopImage, { 15, 485 }, { 0,0 }, true, false, { 1985, 1966, 65, 82 }, nullptr, App->scenes, false , false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL, 6);
+	buyWoodProducerButton->hover_rect = { 0, 1966, 65, 82 };
+	buyWoodProducerButton->click_rect = { 65, 1966, 65, 82 };
+	buyPaintExtractorButton = App->gui->AddElement(GUItype::GUI_BUTTON, shopImage, { 80, 485 }, { 0,0 }, true, false, { 1985, 1966, 65, 82 }, nullptr, App->scenes, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL, 6);
+	buyPaintExtractorButton->hover_rect = { 0, 1966, 65, 82 };
+	buyPaintExtractorButton->click_rect = { 65, 1966, 65, 82 };
+	buyBarrackButton = App->gui->AddElement(GUItype::GUI_BUTTON, shopImage, { 145, 485 }, { 0,0 }, true, false, { 1985, 1966, 65, 82 }, nullptr, App->scenes, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL, 6);
+	buyBarrackButton->hover_rect = { 0, 1966, 65, 82 };
+	buyBarrackButton->click_rect = { 65, 1966, 65, 82 };
 
 	//shopLabel = App->gui->AddElement(GUItype::GUI_LABEL, shopImage, { 985 , 352 }, { 2 , 2 }, false, false, { 0, 0, 0, 0 }, "", nullptr, false, false, SCROLL_TYPE::SCROLL_NONE, true, TEXTURE::ATLAS, FONT::FONT_SMALL_WHITE);
 
@@ -462,6 +477,8 @@ bool GameScene::CleanUp()
 void GameScene::GUI_Event_Manager(GUI_Event type, j1Element* element)
 {
 
+	//Minimap
+
 	if (element == miniMapMINI && type == GUI_Event::EVENT_ONCLICK) {
 		miniMapBack->enabled = true;
 		miniMapFULL->enabled = true;
@@ -475,6 +492,10 @@ void GameScene::GUI_Event_Manager(GUI_Event type, j1Element* element)
 		miniMapFULL->enabled = false;
 		miniMapCamera->enabled = true;
 	}
+
+
+	//Quests
+
 	if (element == questsOpenButton && type == GUI_Event::EVENT_ONCLICK)
 	{
 		questsImage->rect.h = 360;
@@ -489,17 +510,35 @@ void GameScene::GUI_Event_Manager(GUI_Event type, j1Element* element)
 		questsCloseButton->enabled = false;
 	}
 
+
+	//HomeButton
+
 	if (element == homeButton && type == GUI_Event::EVENT_ONCLICK)
 	{
 		App->render->camera.x = 0;
 		App->render->camera.y = 0;
 	}
 
+
+	//Shop
+
 	if (element == shopButton && type == GUI_Event::EVENT_ONCLICK)
 	{
-		shopMenu = !shopMenu;
+		shopImage->enabled = !shopImage->enabled;
+		shopLabel->enabled = !shopLabel->enabled;
+		buyWoodProducerButton->enabled = !buyWoodProducerButton->enabled;
+		buyPaintExtractorButton->enabled = !buyPaintExtractorButton->enabled;
+		buyBarrackButton->enabled = !buyBarrackButton->enabled;
 	}
 
+	if (element == buyWoodProducerButton && type == GUI_Event::EVENT_ONCLICK)
+	{
+
+	}
+
+
+	//Pause Menu
+
 	if (element == pauseMenuButton && type == GUI_Event::EVENT_ONCLICK)
 	{
 		App->PAUSE_ACTIVE = true;
@@ -606,6 +645,9 @@ void GameScene::GUI_Event_Manager(GUI_Event type, j1Element* element)
 		backButton->enabled = false;
 	}
 
+
+	//Disclaimers
+
 	if (element == restartButton && type == GUI_Event::EVENT_ONCLICK)
 	{
 		restartMenu = true;
@@ -728,11 +770,7 @@ void GameScene::GUI_Event_Manager(GUI_Event type, j1Element* element)
 		noButton->enabled = false;
 	}
 
-	if (element == shopButton && type == GUI_Event::EVENT_ONCLICK)
-	{
-		shopImage->enabled = !shopImage->enabled;
-		shopLabel->enabled = !shopLabel->enabled;
-	}
+
 
 }
 

diff --git a/PaintWars/Project II Game/Motor2D/GameScene.h b/PaintWars/Project II Game/Motor2D/GameScene.h
@@ -73,17 +73,11 @@ class GameScene : public Scene
 
 	//HUD - Bar
 	j1Element* hudBarImage = nullptr;
-	j1Element* paintImage = nullptr;
 	j1Element* paintLabel = nullptr;
-	j1Element* woodImage = nullptr;
 	j1Element* woodLabel = nullptr;
-	j1Element* metalImage = nullptr;
 	j1Element* metalLabel = nullptr;
-	j1Element* titaniumImage = nullptr;
 	j1Element* titaniumLabel = nullptr;
-	j1Element* foodImage = nullptr;
 	j1Element* foodLabel = nullptr;
-	j1Element* researchImage = nullptr;
 	j1Element* researchLabel = nullptr;
 	j1Element* entitiesImage = nullptr;
 	j1Element* entitiesLabel = nullptr;
@@ -99,7 +93,6 @@ class GameScene : public Scene
 	j1Element* pauseMenuButton = nullptr;
 	bool pauseMenu = false;
 	j1Element* shopButton = nullptr;
-	bool shopMenu = false;
 	j1Element* restartButton = nullptr;
 	bool restartMenu = false;
 
@@ -142,6 +135,9 @@ class GameScene : public Scene
 	// Shop
 	j1Element* shopImage = nullptr;
 	j1Element* shopLabel = nullptr;
+	j1Element* buyPaintExtractorButton = nullptr;
+	j1Element* buyWoodProducerButton = nullptr;
+	j1Element* buyBarrackButton = nullptr;
 	bool debugTile = true;
 
 

diff --git a/PaintWars/Project II Game/Motor2D/Motor2D.vcxproj b/PaintWars/Project II Game/Motor2D/Motor2D.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{2AF9969B-F202-497B-AF30-7BEF9CE8005E}</ProjectGuid>
     <RootNamespace>programacio_2</RootNamespace>
     <ProjectName>PaintWars_by_BrainDeadStudios</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/PaintWars/Project II Game/Motor2D/j1GUIElements.h b/PaintWars/Project II Game/Motor2D/j1GUIElements.h
@@ -26,7 +26,8 @@ enum class FONT
 	FONT_SMALL,
 	FONT_MEDIUM,
 	FONT_SMALL_WHITE,
-	FONT_LOSE_WIN
+	FONT_LOSE_WIN,
+	FONT_EXTRA_SMALL
 };
 
 enum class SCROLL_TYPE

diff --git a/PaintWars/Project II Game/Motor2D/j1Label.cpp b/PaintWars/Project II Game/Motor2D/j1Label.cpp
@@ -25,6 +25,8 @@ bool j1Label::Start()
 		font_name = App->fonts->Load("textures/font_small.png", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789= ", 2);
 	else if (fontType == FONT::FONT_SMALL_WHITE)
 		font_name = App->fonts->Load("textures/font_small_white.png", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789= ", 2);
+	else if (fontType == FONT::FONT_EXTRA_SMALL)
+		font_name = App->fonts->Load("textures/font_extra_small.png", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789= ", 2);
 	//else if (fontType == FONT::FONT_LOSE_WIN)
 	//	font_name = App->fonts->Load("textures/font.png", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789= ",2);