From f7fcf3e7b3e4e95aa1d8ee00bc3bc7f9a5f1031c Mon Sep 17 00:00:00 2001 From: Alexandre jublot Date: Thu, 24 Mar 2022 20:11:37 +0100 Subject: [PATCH] [update] arcade interfaces --- include/GraphicalAPI/arcade/IAudioModule.hpp | 17 +++---------- .../GraphicalAPI/arcade/IDisplayModule.hpp | 12 ++------- include/GraphicalAPI/arcade/ISpriteModule.hpp | 16 +++--------- include/GraphicalAPI/arcade/ITextModule.hpp | 25 ++++++------------- 4 files changed, 18 insertions(+), 52 deletions(-) diff --git a/include/GraphicalAPI/arcade/IAudioModule.hpp b/include/GraphicalAPI/arcade/IAudioModule.hpp index 0344d838..6644ca96 100644 --- a/include/GraphicalAPI/arcade/IAudioModule.hpp +++ b/include/GraphicalAPI/arcade/IAudioModule.hpp @@ -1,13 +1,4 @@ -/* -** EPITECH PROJECT, 2020 -** DynamicLoader.hpp -** File description: -** header for DynamicLoader.c -*/ - -#pragma once - -#include +#include namespace arcade { @@ -17,7 +8,7 @@ namespace arcade virtual ~IAudioModule() = default; // ALL FILE TYPES MUST BE AT THE PATH SPECIFIED - // MUST: loads and set an audio file + // MUST: loads and set an audio file //ex SFML: // assetPath = ./Assets/Pacman/enemy/sound // real path = ./Assets/Pacman/enmey/font.ttf @@ -34,7 +25,7 @@ namespace arcade virtual void stop() = 0; // Must set the volume - virtual void setVolume() = 0; - + virtual void setVolume(float volume) = 0; + }; } \ No newline at end of file diff --git a/include/GraphicalAPI/arcade/IDisplayModule.hpp b/include/GraphicalAPI/arcade/IDisplayModule.hpp index c8d756af..d3ca6a6c 100644 --- a/include/GraphicalAPI/arcade/IDisplayModule.hpp +++ b/include/GraphicalAPI/arcade/IDisplayModule.hpp @@ -1,13 +1,6 @@ -/* -** EPITECH PROJECT, 2020 -** DynamicLoader.hpp -** File description: -** header for DynamicLoader.c -*/ - #pragma once -#include +#include namespace arcade { @@ -192,7 +185,7 @@ namespace arcade public: - // DRAW LOGIC: + // DRAW LOGIC: // MUST : draw a sprite module virtual void draw(ISpriteModule *sprite) = 0; @@ -203,4 +196,3 @@ namespace arcade ///////////////////////////////////////////////////////// }; } - diff --git a/include/GraphicalAPI/arcade/ISpriteModule.hpp b/include/GraphicalAPI/arcade/ISpriteModule.hpp index 438529f4..6769850c 100644 --- a/include/GraphicalAPI/arcade/ISpriteModule.hpp +++ b/include/GraphicalAPI/arcade/ISpriteModule.hpp @@ -1,24 +1,16 @@ -/* -** EPITECH PROJECT, 2020 -** DynamicLoader.hpp -** File description: -** header for DynamicLoader.c -*/ - #pragma once -#include - +#include namespace arcade { class ISpriteModule { public: virtual ~ISpriteModule() = default; + // USED ONLY IN WRAPPER //MUST : return the object sprite or texture to draw virtual void *getSprite() = 0; - // ALL FILE TYPES MUST BE AT THE PATH SPECIFIED // MUST: set a sprite (ex: creates a texture then a sprite from it in SFML) @@ -27,7 +19,6 @@ namespace arcade // real path (inside sfml implementation) =./Assets/Pacman/enmey/goblin/enemy.png or .jpeg virtual void setSprite(std::string filePath) = 0; - // MUST: set position of the sprite virtual void setPosition(float x, float y) = 0; @@ -38,6 +29,7 @@ namespace arcade virtual void setCrop(int x, int y, int width, int height) = 0; // MUST: set the sprite color - virtual void setColor(unsigned char r, unsigned char g, unsigned char b) = 0; + virtual void + setColor(unsigned char r, unsigned char g, unsigned char b) = 0; }; } \ No newline at end of file diff --git a/include/GraphicalAPI/arcade/ITextModule.hpp b/include/GraphicalAPI/arcade/ITextModule.hpp index e8e362c0..094de80f 100644 --- a/include/GraphicalAPI/arcade/ITextModule.hpp +++ b/include/GraphicalAPI/arcade/ITextModule.hpp @@ -1,13 +1,4 @@ -/* -** EPITECH PROJECT, 2020 -** DynamicLoader.hpp -** File description: -** header for DynamicLoader.c -*/ - -#pragma once - -#include +#include namespace arcade { @@ -15,30 +6,30 @@ namespace arcade { public: virtual ~ITextModule() = default; + // USED ONLY IN WRAPPER // MUST : return the text object to draw virtual void *getText() = 0; - // MUST: set the text value virtual void setText(std::string text) = 0; // MUST: Set the text position; - virtual void setPosition(int x, int y) = 0; + virtual void setPosition(float x, float y) = 0; // MUST: move the text - virtual void move(int x, int y) = 0; - + virtual void move(float x, float y) = 0; // ALL FILE TYPES MUST BE AT THE PATH SPECIFIED - // MUST: loads and set a text font - //ex SFML: + // MUST: loads and set a text font + //ex SFML: // assetPath = ./Assets/Pacman/enemy/font // real path = ./Assets/Pacman/enmey/font.ttf virtual void setFont(std::string font) = 0; // MUST: Set the text color - virtual void setColor(unsigned char r, unsigned char g, unsigned char b) = 0; + virtual void + setColor(unsigned char r, unsigned char g, unsigned char b) = 0; // MUST: Set the text size virtual void setSize(int size) = 0;