allan.point
/
projet-tut
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

settings view with no audio interaction anymore

Browse Source
master
Mathis RIBEMONT 3 years ago
parent 54ab4dd4a7
commit 59bdec983d
8 changed files with 87 additions and 31 deletions
Show Stats Download Patch File Download Diff File

BIN
Pontu/buildDebug/Pontu
View File

Binary file not shown.

1
Pontu/buildDebug/rsrc
Unescape View File

@ -0,0 +1 @@
../rsrc/

2
Pontu/include/engine/InputElement.h
Unescape View File

@ -100,7 +100,7 @@ InputElement createInputElementResizeWindow();
InputElement createInputElementCloseWindow();
InputElement createInputElementButtonClicked(P_Button* button, const ButtonEvent event);
InputElement createInputElementButtonChanged(P_Button* button, const ButtonEvent event);
InputElement createInputElementTextInput(TextInput* textInput);

6
Pontu/include/view/Settings.h
Unescape View File

@ -1,5 +1,5 @@
/**
* \file Settings.h
* \file Settings.h
* \brief Settings view
* \author Théotime Maillarbaux
* \date 24/01/2022
@ -30,8 +30,8 @@ typedef struct {
* \param[in] ah The AudioHandler in use
* \return true if the view could be generated, else false
*/
RetValues drawSettingsView(SDL_Renderer* renderer, AudioHandler* ah, const FontHandler* fh);
// RetValues drawSettingsView(SDL_Renderer* renderer, AudioHandler* ah, const FontHandler* fh);
//
void settingsView(SDL_Window* parent, AudioHandler* ah, const FontHandler* fh);
#endif // SETTINGS_H

1
Pontu/rsrc/rsrc
Unescape View File

@ -0,0 +1 @@
rsrc

2
Pontu/src/engine/InputElement.c
Unescape View File

@ -31,7 +31,7 @@ InputElement createInputElementResizeWindow(const int w, const int h) {
return i;
}
InputElement createInputElementButtonClicked(P_Button* button, const ButtonEvent event) {
InputElement createInputElementButtonChanged(P_Button* button, const ButtonEvent event) {
InputElement i = {
.type = InputType_ButtonChanged,
.data.buttonEvent={.event=event, .button = button}

4
Pontu/src/engine/InputProcessor.c
Unescape View File

@ -34,7 +34,7 @@ InputElement proccessInput(InputProcessor *inputProcessor)
P_Button* b = &inputProcessor->tabButton.elems[i];
if (isHover(b)) {
b->onClick(b);
break;
break;
}
}
bool textInputClicked = false;
@ -68,7 +68,7 @@ InputElement proccessInput(InputProcessor *inputProcessor)
P_Button* b = &inputProcessor->tabButton.elems[i];
int res = isButtonInteractWithCursor(b, event.motion.x, event.motion.y);
if (res != BUTTON_NOTHING) {
return createInputElementButtonClicked(b, res);
return createInputElementButtonChanged(b, res);
}
}
break;

102
Pontu/src/view/Settings.c
Unescape View File

@ -7,8 +7,13 @@
// Global functions
enum nameTextLabel {TITRE, MUSIC_VOLUME, SFX_VOLUME, MASTER_VOLUME};
enum nameButton {MOINSVOLUME,PLUSVOLUME,MOINSSFX,PLUSSFX,MOINSMASTER,PLUSMASTER,QUIT};
void createSettingsView(SDL_Window * window, SDL_Renderer* renderer, AudioHandler* ah, const FontHandler* fh, const InputProcessor * inputProcessor, struct array_TextLabel * arrayTextLabel, SDL_Texture * numberTexture) {
void quitSettings(P_Button * caller){
*((bool*)(caller->arg)) = false;
}
void createSettingsView(SDL_Window * window, SDL_Renderer* renderer, AudioHandler* ah, const FontHandler* fh, InputProcessor * inputProcessor, struct array_TextLabel * arrayTextLabel, SDL_Texture * numberTexture) {
TTF_Font* font = fh->fonts[FONT_PublicPixel];
SDL_Color white = {.r = 255, .g = 255, .b = 255, .a = 255};
int windowWidth, windowHeight;
@ -16,6 +21,7 @@ void createSettingsView(SDL_Window * window, SDL_Renderer* renderer, AudioHandle
SDL_Color lightBlue = {.r = 0,.g = 195,.b = 255,.a = 0}; //0, 195, 255
SDL_Color darkBlue = {.r = 0,.g = 123,.b = 161,.a = 0}; //0, 123, 161
int elementSpacing = 40;
//titre;
SDL_Point titre_point = {.x = windowWidth/2, .y = 30};
@ -23,32 +29,71 @@ void createSettingsView(SDL_Window * window, SDL_Renderer* renderer, AudioHandle
array_TextLabel_AddElement(arrayTextLabel, titre);
//+ textures
int plusHeight, plusWidth;
SDL_Texture * plusTexture = createGenericButtonTexture("+",font,20,darkBlue,lightBlue,3,3,&plusWidth,&plusHeight,renderer);
SDL_Texture * plusTextureHover = createGenericButtonTexture("+",font,20,lightBlue,darkBlue,3,3,&plusWidth,&plusHeight,renderer);
//- textures
int moinsHeight, moinsWidth;
SDL_Texture * moinsTexture = createGenericButtonTexture("-",font,20,darkBlue,lightBlue,3,3,&moinsWidth,&moinsHeight,renderer);
SDL_Texture * moinsTextureHover = createGenericButtonTexture("-",font,20,lightBlue,darkBlue,3,3,&moinsWidth,&moinsHeight,renderer);
int padding_Label_Left = 20;
//Music volume label
SDL_Point musicVolumeLabelPoint = {.x = padding_Label_Left, .y = titre.textZone.h + 50 + titre.textZone.y};
SDL_Point musicVolumeLabelPoint = {.x = padding_Label_Left, .y = titre.textZone.h + elementSpacing + titre.textZone.y};
TextLabel musicVolumeLabel = createTextLabel("Music Volume", &musicVolumeLabelPoint, 1.5,&white, font, renderer, POSX_LEFT, POSY_CENTER);
array_TextLabel_AddElement(arrayTextLabel, musicVolumeLabel);
//- volume button
P_Button moinsVolumeButton = createButton(moinsTexture,moinsTextureHover,windowWidth/2 + 100,musicVolumeLabelPoint.y - moinsHeight/2,moinsWidth,moinsHeight, NULL);
array_P_Button_AddElement(&inputProcessor->tabButton,moinsVolumeButton);
//+ volume button
P_Button plusVolumeButton = createButton(plusTexture,plusTextureHover,moinsVolumeButton.rect.x + moinsVolumeButton.rect.w + 25,moinsVolumeButton.rect.y,plusWidth,plusHeight, NULL);
array_P_Button_AddElement(&inputProcessor->tabButton,plusVolumeButton);
//SFX volume label
SDL_Point sfxVolumeLabelPoint = {.x = padding_Label_Left, .y = musicVolumeLabel.textZone.h + 50 + musicVolumeLabel.textZone.y};
SDL_Point sfxVolumeLabelPoint = {.x = padding_Label_Left, .y = musicVolumeLabel.textZone.h + musicVolumeLabel.textZone.y + elementSpacing};
TextLabel sfxVolumeLabel = createTextLabel("Effect Volume", &sfxVolumeLabelPoint, 1.5,&white, font, renderer, POSX_LEFT, POSY_CENTER);
array_TextLabel_AddElement(arrayTextLabel, sfxVolumeLabel);
//- SFX button
P_Button moinsSFXButton = createButton(moinsTexture,moinsTextureHover,windowWidth/2 + 100,sfxVolumeLabelPoint.y - moinsHeight/2,moinsWidth,moinsHeight, NULL);
array_P_Button_AddElement(&inputProcessor->tabButton,moinsSFXButton);
//SFX volume label
SDL_Point masterVolumeLabelPoint = {.x = padding_Label_Left, .y = sfxVolumeLabel.textZone.h + 50 + sfxVolumeLabel.textZone.y};
//+ SFX button
P_Button plusSFXButton = createButton(plusTexture,plusTextureHover,moinsSFXButton.rect.x + moinsSFXButton.rect.w + 25,sfxVolumeLabelPoint.y - moinsHeight/2,plusWidth,plusHeight, NULL);
array_P_Button_AddElement(&inputProcessor->tabButton,plusSFXButton);
//Master volume label
SDL_Point masterVolumeLabelPoint = {.x = padding_Label_Left, .y = sfxVolumeLabel.textZone.h + elementSpacing + sfxVolumeLabel.textZone.y};
TextLabel masterVolumeLabel = createTextLabel("Master Volume", &masterVolumeLabelPoint, 1.5,&white, font, renderer, POSX_LEFT, POSY_CENTER);
array_TextLabel_AddElement(arrayTextLabel, masterVolumeLabel);
//- master button
P_Button moinsMasterButton = createButton(moinsTexture,moinsTextureHover,windowWidth/2 + 100,masterVolumeLabelPoint.y - moinsHeight/2,moinsWidth,moinsHeight, NULL);
array_P_Button_AddElement(&inputProcessor->tabButton,moinsMasterButton);
//+ master button
P_Button plusMasterButton = createButton(plusTexture,plusTextureHover,moinsMasterButton.rect.x + moinsMasterButton.rect.w + 25,masterVolumeLabelPoint.y - moinsHeight/2,plusWidth,plusHeight, NULL);
array_P_Button_AddElement(&inputProcessor->tabButton,plusMasterButton);
//quit button
P_Button quitButton = createButton(NULL,NULL,0, 0, 20, 20, NULL);
P_Button quitButton = createButton(NULL,NULL,0, 0, 20, 20, quitSettings);
quitButton.texture = createGenericButtonTexture("Quitter",font,50,darkBlue,lightBlue,5, 10,&(quitButton.rect.w),&(quitButton.rect.h),renderer);
quitButton.hoverTexture = createGenericButtonTexture("Quitter",font,50,lightBlue,darkBlue,5, 10,NULL,NULL,renderer);
quitButton.rect.y = windowHeight - quitButton.rect.h - 50;
quitButton.rect.y = windowHeight - quitButton.rect.h - elementSpacing;
quitButton.rect.x = windowWidth/2 - quitButton.rect.w/2;
array_P_Button_AddElement(&inputProcessor->tabButton,quitButton);
}
@ -83,31 +128,40 @@ void settingsView(SDL_Window* parent, AudioHandler* ah, const FontHandler* fh) {
drawTextLabel(renderer,&arrayTextLabel.elems[MUSIC_VOLUME]);
drawTextLabel(renderer,&arrayTextLabel.elems[SFX_VOLUME]);
drawTextLabel(renderer,&arrayTextLabel.elems[MASTER_VOLUME]);
drawButtonOnRenderer(renderer,&inputProcessor.tabButton.elems[0]);
SDL_Event event;
bool etat = true;
InputElement inputElement;
for(int i = 0; i < inputProcessor.tabButton.size; i++){
drawButtonOnRenderer(renderer,&inputProcessor.tabButton.elems[i]);
}
//arg for quit button
inputProcessor.tabButton.elems[QUIT].arg = &etat;
bool hasToPresent = true;
while (etat) {
while (SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_WINDOWEVENT:
switch (event.window.event) {
case SDL_WINDOWEVENT_CLOSE:
etat = false;
printf("Quit\n");
fflush(stdout);
break;
default:
break;
}
while (InputType_None != (inputElement = proccessInput(&inputProcessor)).type) {
switch (inputElement.type){
case InputType_ButtonChanged:
drawButtonOnRenderer(renderer,inputElement.data.buttonEvent.button);
hasToPresent = true;
break;
case InputType_Window_Close:
etat = false;
break;
default:
break;
}
SDL_Delay(20);
}
SDL_RenderPresent(renderer);
SDL_Delay(20);
if(hasToPresent){
SDL_RenderPresent(renderer);
hasToPresent = false;
}
}
quit:

Write Preview
Loading…
Cancel
Save