Fix build
This commit is contained in:
parent
c1389218f2
commit
160b746182
8 changed files with 22 additions and 5 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -2,3 +2,4 @@
|
||||||
.project
|
.project
|
||||||
.settings/
|
.settings/
|
||||||
/Debug/
|
/Debug/
|
||||||
|
/build/
|
||||||
|
|
|
@ -6,9 +6,14 @@
|
||||||
#include "DrawingManager.h"
|
#include "DrawingManager.h"
|
||||||
#include "DrawingSurface.h"
|
#include "DrawingSurface.h"
|
||||||
#include "DrawingContext.h"
|
#include "DrawingContext.h"
|
||||||
|
#include "Rasterizer.h"
|
||||||
|
#include "Grid.h"
|
||||||
|
#include "Image.h"
|
||||||
|
|
||||||
#include "TextElement.h"
|
#include "TextElement.h"
|
||||||
#include "DiscretePoint.h"
|
#include "DiscretePoint.h"
|
||||||
|
|
||||||
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
|
||||||
MainApplication::MainApplication()
|
MainApplication::MainApplication()
|
||||||
|
|
|
@ -7,7 +7,9 @@ class AbstractGeometricItem
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
Rectangle GetBounds() const = 0;
|
virtual ~AbstractGeometricItem() = default;
|
||||||
|
|
||||||
void Sample(Grid* grid) const = 0;
|
//Rectangle GetBounds() const = 0;
|
||||||
|
|
||||||
|
virtual void Sample(Grid* grid) const = 0;
|
||||||
};
|
};
|
||||||
|
|
|
@ -14,7 +14,7 @@ public:
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle GetBounds() const override
|
Rectangle GetBounds() const
|
||||||
{
|
{
|
||||||
return Rectangle(mBottomLeft, mTopRight);
|
return Rectangle(mBottomLeft, mTopRight);
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,10 +40,11 @@ target_include_directories(graphics PUBLIC
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/cairo"
|
"${CMAKE_CURRENT_SOURCE_DIR}/cairo"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/opengl"
|
"${CMAKE_CURRENT_SOURCE_DIR}/opengl"
|
||||||
"${PROJECT_SOURCE_DIR}/src/geometry/"
|
"${PROJECT_SOURCE_DIR}/src/geometry/"
|
||||||
|
"${PROJECT_SOURCE_DIR}/src/image/"
|
||||||
"${PROJECT_SOURCE_DIR}/src/visual_elements/"
|
"${PROJECT_SOURCE_DIR}/src/visual_elements/"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(graphics PUBLIC visual_elements ${platform_LIBS})
|
target_link_libraries(graphics PUBLIC visual_elements image GL ${platform_LIBS})
|
||||||
|
|
||||||
set_property(TARGET graphics PROPERTY FOLDER src)
|
set_property(TARGET graphics PROPERTY FOLDER src)
|
||||||
set_target_properties( graphics PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
|
set_target_properties( graphics PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
|
|
@ -5,6 +5,9 @@
|
||||||
#include "DrawingContext.h"
|
#include "DrawingContext.h"
|
||||||
#include "Rasterizer.h"
|
#include "Rasterizer.h"
|
||||||
|
|
||||||
|
#include "Grid.h"
|
||||||
|
#include "Image.h"
|
||||||
|
|
||||||
DrawingManager::DrawingManager()
|
DrawingManager::DrawingManager()
|
||||||
: mRasterizer(std::make_unique<Rasterizer>())
|
: mRasterizer(std::make_unique<Rasterizer>())
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "DrawingSurface.h"
|
#include "DrawingSurface.h"
|
||||||
|
|
||||||
|
#include "Image.h"
|
||||||
|
|
||||||
std::unique_ptr<DrawingSurface> DrawingSurface::Create()
|
std::unique_ptr<DrawingSurface> DrawingSurface::Create()
|
||||||
{
|
{
|
||||||
|
@ -41,5 +42,5 @@ unsigned DrawingSurface::GetHeight() const
|
||||||
|
|
||||||
void DrawingSurface::Paint(Grid* grid)
|
void DrawingSurface::Paint(Grid* grid)
|
||||||
{
|
{
|
||||||
mImageBuffer = std::make_unique<Image>();
|
//mImageBuffer = std::make_unique<Image>();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
#include "Image.h"
|
#include "Image.h"
|
||||||
#include "PngWriter.h"
|
#include "PngWriter.h"
|
||||||
#include "DrawingManager.h"
|
#include "DrawingManager.h"
|
||||||
|
#include "DrawingSurface.h"
|
||||||
|
#include "DrawingContext.h"
|
||||||
|
#include "Grid.h"
|
||||||
|
#include "Rasterizer.h"
|
||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue