mirror of
https://github.com/zoriya/Bomberman.git
synced 2026-06-05 10:59:48 +00:00
fix compilation
This commit is contained in:
@@ -67,11 +67,11 @@ set(SRC
|
||||
src/Drawables/2D/Point.cpp
|
||||
src/Drawables/2D/Rectangle.cpp
|
||||
src/Drawables/2D/Text.cpp
|
||||
src/Drawables/2D/Triangle.cpp
|
||||
src/Drawables/ADrawable2D.cpp
|
||||
src/Drawables/ADrawable3D.cpp
|
||||
src/Drawables/Image.cpp
|
||||
src/Drawables/Texture.cpp
|
||||
src/Drawables/Triangle.cpp
|
||||
src/Color.cpp
|
||||
src/Font.cpp
|
||||
src/Model.cpp
|
||||
|
||||
@@ -5,10 +5,8 @@
|
||||
** Canvas
|
||||
*/
|
||||
|
||||
#ifndef Canvas_HPP_
|
||||
#define Canvas_HPP_
|
||||
|
||||
#include "Drawables/IDrawable.hpp"
|
||||
#ifndef CANVAS_HPP_
|
||||
#define CANVAS_HPP_
|
||||
|
||||
namespace RAY {
|
||||
namespace Drawables {
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace RAY::Drawables::Drawables2D {
|
||||
//! @param positionB position of B point
|
||||
//! @param positionC position of C point
|
||||
//! @param Color Color of the circle
|
||||
Triangle(const Vector2 &positionA, Vector2 positionB, Vector2 positionC,int length, const Color &color);
|
||||
Triangle(const Vector2 &positionA, Vector2 positionB, Vector2 positionC, const Color &color);
|
||||
|
||||
|
||||
//! @brief A default copy constructor
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
namespace RAY
|
||||
{
|
||||
class Texture: public Canvas, IRessource {
|
||||
class Texture: public IRessource {
|
||||
public:
|
||||
//! @brief Create an texture, loading a file
|
||||
//! @param filename: path to file to load
|
||||
|
||||
@@ -12,11 +12,12 @@
|
||||
#include <string>
|
||||
#include "Vector.hpp"
|
||||
#include "Controllers/Keyboard.hpp"
|
||||
#include "Canvas.hpp"
|
||||
#include "Camera/Camera2D.hpp"
|
||||
#include "Camera/Camera3D.hpp"
|
||||
#include "Drawables/Texture.hpp"
|
||||
#include "Color.hpp"
|
||||
#include "Canvas.hpp"
|
||||
#include "Drawables/IDrawable.hpp"
|
||||
#include "Drawables/Texture.hpp"
|
||||
|
||||
namespace RAY {
|
||||
class Window: public Canvas {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "Drawables/2D/Triangle.hpp"
|
||||
#include <exception>
|
||||
|
||||
RAY::Drawables::Drawables2D::Triangle::Triangle(const Vector2 &positionA, Vector2 positionB, Vector2 positionC,int length, const Color &color):
|
||||
RAY::Drawables::Drawables2D::Triangle::Triangle(const Vector2 &positionA, Vector2 positionB, Vector2 positionC, const Color &color):
|
||||
ADrawable2D(positionA, color), _posB(positionB), _posC(positionC)
|
||||
{
|
||||
|
||||
@@ -55,6 +55,7 @@ void RAY::Drawables::Drawables2D::Triangle::drawOn(RAY::Window &window)
|
||||
|
||||
void RAY::Drawables::Drawables2D::Triangle::drawOn(RAY::Image &image)
|
||||
{
|
||||
(void)image;
|
||||
throw std::exception();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user