JonathanHager
/
aufbauspiel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Function pointers added and mouseOnUi Flag fixed

Browse Source
main
Jan 3 years ago
parent 1c1d919672
commit ac9072fe01
9 changed files with 138 additions and 70 deletions
Show Stats Download Patch File Download Diff File

5
Makefile
Unescape View File

@ -1,6 +1,6 @@
CC = gcc CC = gcc
FLAGS = -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 FLAGS = -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
OBJS = main.o sprite.o inputHandler.o isometricMap.o game.o textureatlas.o animation.o animationHandler.o button.o uiContainer.o debug.o building.o entity.o selectable.o task.o OBJS = main.o sprite.o inputHandler.o isometricMap.o game.o textureatlas.o animation.o animationHandler.o button.o uiContainer.o debug.o building.o entity.o selectable.o task.o onClickFunctions.o
spiel: $(OBJS) spiel: $(OBJS)
$(CC) -o spiel $(OBJS) $(FLAGS) $(CC) -o spiel $(OBJS) $(FLAGS)
@ -50,5 +50,8 @@ selectable.o: Ui/selectable.c
task.o: Entity/task.c task.o: Entity/task.c
$(CC) -c Entity/task.c $(FLAGS) $(CC) -c Entity/task.c $(FLAGS)
onClickFunctions.o: Ui/onClickFunctions.c
$(CC) -c Ui/onClickFunctions.c $(FLAGS)
clean: clean:
rm *.o spiel rm *.o spiel

25
Ui/button.c
Unescape View File

@ -4,6 +4,7 @@
#include "stdlib.h" #include "stdlib.h"
#include "raylib.h" #include "raylib.h"
#include "string.h" #include "string.h"
#include "onClickFunctions.h"
Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int fontSize, int id){ Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text, int textLEN, int fontSize, int id){
Button *button = malloc(sizeof(Button)); Button *button = malloc(sizeof(Button));
@ -22,25 +23,28 @@ Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text,
button->fontSize = fontSize; button->fontSize = fontSize;
return button;
}
void ButtonExecuteButton(Button *button, Game *game){
button->state = BUTTON_STATE_DEFAULT;
switch(button->id){ switch(button->id){
case BUTTON_ID_CONTINUE: // continue game case BUTTON_ID_CONTINUE:
game->screen = SCREEN_GAME; button->onClick = &OnClickContinueButton;
break; break;
case BUTTON_ID_EXIT: case BUTTON_ID_EXIT:
game->screen = SCREEN_EXIT; button->onClick = &OnClickExitButton;
break; break;
case BUTTON_ID_START_GAME: case BUTTON_ID_START_GAME:
game->screen = SCREEN_GAME; button->onClick = &OnClickStartButton;
break; break;
default: default:
printf("\n\n\n\n\n\n Unsupported Button ID %d \n\n\n\n\n\n", button->id); printf("\n\n\n\n\n\n Unsupported Button ID %d \n\n\n\n\n\n", button->id);
button->onClick = &OnClickButton;
break; break;
} }
return button;
}
void ButtonExecuteButton(Button *button, Game *game){
button->state = BUTTON_STATE_DEFAULT;
button->onClick(game, button);
} }
void ButtonDrawButton(Button * button){ void ButtonDrawButton(Button * button){
@ -49,7 +53,7 @@ void ButtonDrawButton(Button * button){
DrawText(button->text, button->centerPosition.x - MeasureText(button->text, button->fontSize)/2, button->centerPosition.y - button->fontSize/2, button->fontSize, BLACK); DrawText(button->text, button->centerPosition.x - MeasureText(button->text, button->fontSize)/2, button->centerPosition.y - button->fontSize/2, button->fontSize, BLACK);
} }
int ButtonUpdateButtonState(Button * button){ int ButtonUpdateButtonState(Button * button, Game *game){
if(button->state == BUTTON_STATE_RELEASED){ if(button->state == BUTTON_STATE_RELEASED){
// Wir verlassen den RELEASED State automatisch wenn wir den Code des Buttons ausführen, siehe ButtonExecuteButton // Wir verlassen den RELEASED State automatisch wenn wir den Code des Buttons ausführen, siehe ButtonExecuteButton
// So lange der Code nicht ausgeführt wurde bleiben wir im state damit er definitiv im nächsten Frame ausgeführt wird // So lange der Code nicht ausgeführt wurde bleiben wir im state damit er definitiv im nächsten Frame ausgeführt wird
@ -60,6 +64,7 @@ int ButtonUpdateButtonState(Button * button){
GetMouseY() > button->position.y && GetMouseY() > button->position.y &&
GetMouseY() < button->position.y + button->textures[button->state].height GetMouseY() < button->position.y + button->textures[button->state].height
){ ){
game->mouseOnUI = 1;
if(IsMouseButtonDown(MOUSE_BUTTON_LEFT)){ if(IsMouseButtonDown(MOUSE_BUTTON_LEFT)){
return button->state = BUTTON_STATE_PRESSED; return button->state = BUTTON_STATE_PRESSED;
} }

6
Ui/button.h
Unescape View File

@ -4,6 +4,8 @@
#include "raylib.h" #include "raylib.h"
#include "../game.h" #include "../game.h"
typedef struct Button Button;
typedef struct Button{ typedef struct Button{
Texture2D textures[4]; // [0]: Normal [1]: Hovered [2]: Pressed [3]: Released Texture2D textures[4]; // [0]: Normal [1]: Hovered [2]: Pressed [3]: Released
Vector2 position; // Linke obere Ecke des Buttons Vector2 position; // Linke obere Ecke des Buttons
@ -12,6 +14,8 @@ typedef struct Button{
int state; // 0: default 1: hovered 2: pressed 3: released int state; // 0: default 1: hovered 2: pressed 3: released
int id; // Durch die ID wird dem Button eine Funktion zugeordnet int id; // Durch die ID wird dem Button eine Funktion zugeordnet
int fontSize; // FontSize kann für jeden Button individuell festgelegt werden int fontSize; // FontSize kann für jeden Button individuell festgelegt werden
void (*onClick)(Game *game, Button *button);
} Button; } Button;
// Textures: [0]: Normal [1]: Hovered [2]: Pressed [3]: Released // Textures: [0]: Normal [1]: Hovered [2]: Pressed [3]: Released
@ -20,7 +24,7 @@ Button * ButtonInitButton(Texture2D textures[4], Vector2 *position, char *text,
// executes the logic of one button of certain id - huge switch? // executes the logic of one button of certain id - huge switch?
void ButtonExecuteButton(Button *button, Game * game); void ButtonExecuteButton(Button *button, Game * game);
int ButtonUpdateButtonState(Button * button); int ButtonUpdateButtonState(Button * button, Game *game);
void ButtonDrawButton(Button * button); void ButtonDrawButton(Button * button);

52
Ui/onClickFunctions.c
Unescape View File

@ -0,0 +1,52 @@
#include "../game.h"
#include "selectable.h"
#include "button.h"
#include "../definitions.h"
#include "raylib.h"
#include "stdio.h"
#include "../MapObject/building.h"
#include "../Sprite/sprite.h"
#include "../Entity/entity.h"
#include "../Input/inputHandler.h"
void OnClickButton(Game *game, Button *button){
printf("\n\n\n\n\n\n Unsupported Button ID %d \n\n\n\n\n\n", button->id);
return;
}
void OnClickContinueButton(Game *game, Button *button){
game->screen = SCREEN_GAME;
}
void OnClickExitButton(Game *game, Button *button){
game->screen = SCREEN_EXIT;
}
void OnClickStartButton(Game *game, Button *button){
game->screen = SCREEN_GAME;
}
// Hier sollte eine Bedingung stehen die nur in einem Frame true sein kann
// Oder das selectable wird abgewählt indem seine ID auf default zurückgesetzt wird
// Sonst kann das hier jeden Frame passieren. ID wird nicht automatisch zurückgesetzt
void OnSelectedSelectable(Game *game, Selectable *selectable){
printf("\n\n\n\n\n\n WARNING: Unsupported SELECTABLE ID %d \n\n\n\n\n\n", selectable->id);
return;
}
void OnSelectedSpawnBuilding(Game *game, Selectable *selectable){
if(IsMouseButtonDown(MOUSE_BUTTON_LEFT) && game->mouseOnUI == 0){
Building *newObject = BuildingInit(game, BU_HOUSE, game->inputHandler->cursorWorldPos.x, game->inputHandler->cursorWorldPos.y);
BuildingListInsert(game->buildings, newObject);
selectable->state = SELECTABLE_STATE_DEFAULT;
}
}
void OnSelectedSpawnWorker(Game *game, Selectable *selectable){
if(IsMouseButtonDown(MOUSE_BUTTON_LEFT) && game->mouseOnUI == 0){
Sprite *newSprite = SpriteCreate(game->textures, TE_WORKER, game->inputHandler->cursorWorldPos.x, game->inputHandler->cursorWorldPos.y);
Entity *entity = EntityInit(newSprite, PR_BUILDER, game->textures);
EntityListInsert(game->entities, entity);
SpriteListInsert(game->sprites, newSprite);
selectable->state = SELECTABLE_STATE_DEFAULT;
}
}

16
Ui/onClickFunctions.h
Unescape View File

@ -0,0 +1,16 @@
#ifndef ONCLICK_H_
#define ONCLICK_H_
#include "../game.h"
#include "button.h"
#include "selectable.h"
void OnClickButton(Game *game, Button *button);
void OnClickContinueButton(Game *game, Button *button);
void OnClickExitButton(Game *game, Button *button);
void OnClickStartButton(Game *game, Button *button);
void OnSelectedSelectable(Game *game, Selectable *selectable);
void OnSelectedSpawnBuilding(Game *game, Selectable *selectable);
void OnSelectedSpawnWorker(Game *game, Selectable *selectable);
#endif

56
Ui/selectable.c
Unescape View File

@ -7,6 +7,7 @@
#include "../Sprite/sprite.h" #include "../Sprite/sprite.h"
#include "../Input/inputHandler.h" #include "../Input/inputHandler.h"
#include "../Entity/entity.h" #include "../Entity/entity.h"
#include "onClickFunctions.h"
Selectable * SelectableInit(Texture2D textures[3], Texture2D backgroundTextures[3], int hasBackground, Vector2 *position, char *description, Selectable * SelectableInit(Texture2D textures[3], Texture2D backgroundTextures[3], int hasBackground, Vector2 *position, char *description,
int showDescripton, int descriptionLEN, int fontSize, int id, int groupID){ int showDescripton, int descriptionLEN, int fontSize, int id, int groupID){
@ -35,53 +36,44 @@ Selectable * SelectableInit(Texture2D textures[3], Texture2D backgroundTextures[
selectable->state = 0; selectable->state = 0;
selectable->groupID = groupID; selectable->groupID = groupID;
return selectable;
}
void SelectableExecuteSelectable(Selectable *selectable, Game * game){
// Hier sollte eine Bedingung stehen die nur in einem Frame true sein kann
// Oder das selectable wird abgewählt indem seine ID auf default zurückgesetzt wird
// Sonst kann das hier jeden Frame passieren. ID wird nicht automatisch zurückgesetzt
switch(selectable->id){ switch(selectable->id){
case SELECTABLE_ID_SPAWN_BUILDING: // Test Case Platzhalter case SELECTABLE_ID_SPAWN_BUILDING:
// Hier sollte eine Bedingung stehen die nur in einem Frame true sein kann selectable->onSelected = &OnSelectedSpawnBuilding;
// Oder das selectable wird abgewählt indem seine ID auf default zurückgesetzt wird
// Sonst kann das hier jeden Frame passieren. ID wird nicht automatisch zurückgesetzt
if(IsMouseButtonDown(MOUSE_BUTTON_LEFT) && game->mouseOnUI == 0){
Building *newObject = BuildingInit(game, BU_HOUSE, game->inputHandler->cursorWorldPos.x, game->inputHandler->cursorWorldPos.y);
BuildingListInsert(game->buildings, newObject);
selectable->state = SELECTABLE_STATE_DEFAULT;
}
break; break;
case SELECTABLE_ID_SPAWN_WORKER: case SELECTABLE_ID_SPAWN_WORKER:
if(IsMouseButtonDown(MOUSE_BUTTON_LEFT) && game->mouseOnUI == 0){ selectable->onSelected = &OnSelectedSpawnWorker;
Sprite *newSprite = SpriteCreate(game->textures, TE_WORKER, game->inputHandler->cursorWorldPos.x, game->inputHandler->cursorWorldPos.y); break;
Entity *entity = EntityInit(newSprite, PR_BUILDER, game->textures);
EntityListInsert(game->entities, entity);
SpriteListInsert(game->sprites, newSprite);
selectable->state = SELECTABLE_STATE_DEFAULT;
}
break;
default: default:
selectable->onSelected = &OnSelectedSelectable;
printf("\n\n\n\n\n\n WARNING: Unsupported SELECTABLE ID %d \n\n\n\n\n\n", selectable->id); printf("\n\n\n\n\n\n WARNING: Unsupported SELECTABLE ID %d \n\n\n\n\n\n", selectable->id);
break; break;
} }
return selectable;
}
void SelectableExecuteSelectable(Selectable *selectable, Game * game){
// CALL SELECTABLE ONCLICK
selectable->onSelected(game, selectable);
} }
int SelectableUpdateSelectableState(Selectable * selectable){ int SelectableUpdateSelectableState(Selectable * selectable, Game *game){
int mouseOnElement = 0;
if(GetMouseX() > selectable->position.x &&
GetMouseX() < selectable->position.x + selectable->backgroundTexture[selectable->state].width &&
GetMouseY() > selectable->position.y &&
GetMouseY() < selectable->position.y + selectable->backgroundTexture[selectable->state].height
){
mouseOnElement = 1;
game->mouseOnUI = 1;
}
if(selectable->state == SELECTABLE_STATE_SELECTED){ if(selectable->state == SELECTABLE_STATE_SELECTED){
if(IsMouseButtonDown(MOUSE_BUTTON_RIGHT)){ if(IsMouseButtonDown(MOUSE_BUTTON_RIGHT)){
return selectable->state = SELECTABLE_STATE_DEFAULT; return selectable->state = SELECTABLE_STATE_DEFAULT;
} }
return SELECTABLE_STATE_SELECTED; return SELECTABLE_STATE_SELECTED;
} }
if(GetMouseX() > selectable->position.x && if(mouseOnElement == 1){
GetMouseX() < selectable->position.x + selectable->backgroundTexture[selectable->state].width &&
GetMouseY() > selectable->position.y &&
GetMouseY() < selectable->position.y + selectable->backgroundTexture[selectable->state].height
){
if(IsMouseButtonDown(MOUSE_BUTTON_LEFT)){ if(IsMouseButtonDown(MOUSE_BUTTON_LEFT)){
return selectable->state = SELECTABLE_STATE_SELECTED; return selectable->state = SELECTABLE_STATE_SELECTED;
} }

5
Ui/selectable.h
Unescape View File

@ -4,7 +4,7 @@
#include "raylib.h" #include "raylib.h"
#include "../game.h" #include "../game.h"
typedef struct Selectable Selectable;
typedef struct Selectable{ typedef struct Selectable{
Vector2 position; // Linke obere Ecke Vector2 position; // Linke obere Ecke
Vector2 centerPosition; // Die Mitte des Selectables Vector2 centerPosition; // Die Mitte des Selectables
@ -19,6 +19,7 @@ typedef struct Selectable{
// Notiz: Die Selectables können auch in einem 2-Dimensionalen Array im UiContainer gespeichert werden, worüber die Groups auch definiert werden könnten // Notiz: Die Selectables können auch in einem 2-Dimensionalen Array im UiContainer gespeichert werden, worüber die Groups auch definiert werden könnten
int groupID; // Selectables können gruppiert werden, man kann also mehrere Dinge gleichzeitig selected haben int groupID; // Selectables können gruppiert werden, man kann also mehrere Dinge gleichzeitig selected haben
void (*onSelected)(Game *game, Selectable *selectable);
}Selectable; }Selectable;
// Textures+backgroundTextures: [0]: Normal | [1]: Hovered | [2]: Selected // Textures+backgroundTextures: [0]: Normal | [1]: Hovered | [2]: Selected
@ -29,7 +30,7 @@ Selectable * SelectableInit(Texture2D textures[3], Texture2D backgroundTextures[
void SelectableExecuteSelectable(Selectable *selectable, Game * game); void SelectableExecuteSelectable(Selectable *selectable, Game * game);
int SelectableUpdateSelectableState(Selectable * selectable); int SelectableUpdateSelectableState(Selectable * selectable, Game *game);
int SelectableUnselectSelectable(Selectable * selectable); int SelectableUnselectSelectable(Selectable * selectable);

31
Ui/uiContainer.c
Unescape View File

@ -130,25 +130,14 @@ UiContainer * UiContainerInitUiContainerForScreenID(int id){
static void UpdateButtons(Game *game, Button **buttons, int buttonCounter){ static void UpdateButtons(Game *game, Button **buttons, int buttonCounter){
int i = 0; int i = 0;
for(i=0 ; i < buttonCounter; i++){ for(i=0 ; i < buttonCounter; i++){
int state = ButtonUpdateButtonState(buttons[i]); int state = ButtonUpdateButtonState(buttons[i], game);
if(state == BUTTON_STATE_HOVERED || state == BUTTON_STATE_PRESSED){
game->mouseOnUI = 1;
}
if(buttons[i]->state == BUTTON_STATE_RELEASED){
ButtonExecuteButton(buttons[i], game);
}
} }
} }
// Only for use in UiContainer, should not be used on their own // Only for use in UiContainer, should not be used on their own
static void UpdateSelectables(Game *game, Selectable **selectables, int selectableCounter){ static void UpdateSelectables(Game *game, Selectable **selectables, int selectableCounter){
int i = 0; int i = 0;
for(i=0 ; i < selectableCounter; i++){ for(i=0 ; i < selectableCounter; i++){
int oldState = selectables[i]->state; int setState = SelectableUpdateSelectableState(selectables[i], game);
int setState = SelectableUpdateSelectableState(selectables[i]);
if(setState == SELECTABLE_STATE_HOVERED || (setState == SELECTABLE_STATE_SELECTED && oldState != SELECTABLE_STATE_SELECTED)){
game->mouseOnUI = 1;
}
// Unselecting every selectable if one is selected // Unselecting every selectable if one is selected
if(setState == SELECTABLE_STATE_SELECTED){ if(setState == SELECTABLE_STATE_SELECTED){
int j; int j;
@ -158,6 +147,20 @@ static void UpdateSelectables(Game *game, Selectable **selectables, int selectab
} }
} }
} }
}
}
static void ExecuteButtons(Game *game, Button **buttons, int buttonCounter){
int i = 0;
for(i=0 ; i < buttonCounter; i++){
if(buttons[i]->state == BUTTON_STATE_RELEASED){
ButtonExecuteButton(buttons[i], game);
}
}
}
static void ExecuteSelectables(Game *game, Selectable **selectables, int selectableCounter){
int i = 0;
for(i=0 ; i < selectableCounter; i++){
if(selectables[i]->state == SELECTABLE_STATE_SELECTED){ if(selectables[i]->state == SELECTABLE_STATE_SELECTED){
SelectableExecuteSelectable(selectables[i], game); SelectableExecuteSelectable(selectables[i], game);
} }
@ -168,6 +171,8 @@ static void UpdateSelectables(Game *game, Selectable **selectables, int selectab
void UiContainerUpdateUiContainer(UiContainer *uiContainer, Game *game){ void UiContainerUpdateUiContainer(UiContainer *uiContainer, Game *game){
UpdateButtons(game, uiContainer->buttons, uiContainer->buttonCounter); UpdateButtons(game, uiContainer->buttons, uiContainer->buttonCounter);
UpdateSelectables(game, uiContainer->selectables, uiContainer->selectableCounter); UpdateSelectables(game, uiContainer->selectables, uiContainer->selectableCounter);
ExecuteButtons(game, uiContainer->buttons, uiContainer->buttonCounter);
ExecuteSelectables(game, uiContainer->selectables, uiContainer->selectableCounter);
} }
// Drawed alle Buttons und Selectables // Drawed alle Buttons und Selectables

12
main.c
Unescape View File

@ -32,19 +32,9 @@ int main(){
while(!WindowShouldClose()){ while(!WindowShouldClose()){
// Drawen wir einfach immer den UI Container vom aktuellen Screen? Aktuell hat ja jeder Screen einen, es sollte also keine Probleme geben // Drawen wir einfach immer den UI Container vom aktuellen Screen? Aktuell hat ja jeder Screen einen, es sollte also keine Probleme geben
// Kann man natürlich auch noch oben in die einzelnen Cases schieben falls es mal Probleme machen sollte // Kann man natürlich auch noch oben in die einzelnen Cases schieben falls es mal Probleme machen sollte
game->mouseOnUI = 0;
UiContainerUpdateUiContainer(game->UiContainers[game->screen], game); UiContainerUpdateUiContainer(game->UiContainers[game->screen], game);
if(game->mouseOnUI == 1 && frame == 0){
frame = 1;
}
if(frame > 0){
frame += GetFrameTime();
}
if(frame >= 1.25){
game->mouseOnUI = 0;
frame = 0;
}
// Moving cursor Sprite to Mouse Pos // Moving cursor Sprite to Mouse Pos
game->cursorSprite->x = GetMousePosition().x; game->cursorSprite->x = GetMousePosition().x;
game->cursorSprite->y = GetMousePosition().y; game->cursorSprite->y = GetMousePosition().y;

Write Preview
Loading…
Cancel
Save