Skip to content

Fixed missing File in CMakeLists.txt causing linking error #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
K1ngjulien wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed missing File in CMakeLists.txt causing linking error #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cbcbf9
Fixed missing File in CMakeLists.txt causing linking error
K1ngjulien Aug 18, 2019
dfdf6f8
Fixed bucket tool crash
K1ngjulien Aug 18, 2019
ba6d4cd
Simplified makeButton call
K1ngjulien Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ bin/
Debug/
Release/

.sln
.sln

#CLion
cmake-build-debug/
.idea/
1 change: 1 addition & 0 deletions strategy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ set(SOURCES
src/tool_strategy/pencil_tool_strategy.cpp
src/tool_strategy/spray_can_strategy.cpp
src/tool_strategy/square_tool_strategy.cpp
src/tool_strategy/eraser_tool_strategy.cpp
)

add_executable(${PROJECT_NAME} ${SOURCES})
Expand Down
6 changes: 4 additions & 2 deletions strategy/src/button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

#include <iostream>

Button::Button(int x, int y, const sf::Texture& texture)
Button::Button(int x, int y, const std::string &iconPath)
: m_button ({Button::BUTTON_SIZE, Button::BUTTON_SIZE})
{

m_texture.loadFromFile(iconPath);
m_button.setPosition((float)x, (float)y);
m_button.setTexture(&texture);
m_button.setTexture(&m_texture);

m_button.setOutlineColor(sf::Color::Black);
m_button.setOutlineThickness(2);
Expand Down
3 changes: 2 additions & 1 deletion strategy/src/button.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ class Button {
public:
constexpr static unsigned BUTTON_SIZE = 32;

Button(int x, int y, const sf::Texture& texture);
Button(int x, int y, const std::string &iconPath);

bool isClicked(sf::Event e) const;

void render(sf::RenderWindow& window);

private:
sf::RectangleShape m_button;
sf::Texture m_texture;
};
37 changes: 10 additions & 27 deletions strategy/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
#include "button.h"
#include "tool_strategy/tool_type_strategy.h"

Button makeButton(const sf::Texture& icon) {

Button makeButton(const std::string &iconPath) {
static int currentX = 10;

Button paintBrushButton(currentX, HEIGHT - 10 - Button::BUTTON_SIZE, icon);
Button paintBrushButton(currentX, HEIGHT - 10 - Button::BUTTON_SIZE, iconPath);
currentX += Button::BUTTON_SIZE * 2;
return paintBrushButton;
}
Expand All @@ -40,31 +41,13 @@ int main() {
toolbar.setOutlineColor(sf::Color::Black);
toolbar.setOutlineThickness(3);

//Toolbar button textures
sf::Texture paintBrushIcon;
sf::Texture fillIcon;
sf::Texture lineIcon;
sf::Texture pencilIcon;
sf::Texture sprayCanIcon;
sf::Texture squareIcon;
sf::Texture eraserIcon;
paintBrushIcon.loadFromFile("res/paintbrush.png");
fillIcon.loadFromFile("res/fill.png");
lineIcon.loadFromFile("res/line.png");
pencilIcon.loadFromFile("res/pencil.png");
sprayCanIcon.loadFromFile("res/spraycan.png");
squareIcon.loadFromFile("res/square.png");
eraserIcon.loadFromFile("res/erase.png");

auto paintBrushButton = makeButton(paintBrushIcon);
auto fillButton = makeButton(fillIcon);
auto lineButton = makeButton(lineIcon);
auto pencilButton = makeButton(pencilIcon);
auto sprayButton = makeButton(sprayCanIcon);
auto squareButton = makeButton(squareIcon);
auto eraserButton = makeButton(eraserIcon);


auto paintBrushButton = makeButton("res/paintbrush.png");
auto fillButton = makeButton("res/fill.png");
auto lineButton = makeButton("res/line.png");
auto pencilButton = makeButton("res/pencil.png");
auto sprayButton = makeButton("res/spraycan.png");
auto squareButton = makeButton("res/square.png");
auto eraserButton = makeButton("res/erase.png");

std::unique_ptr<ToolTypeStrategy> currentTool = std::make_unique<PaintBrushStrategy>();
Options options;
Expand Down
9 changes: 5 additions & 4 deletions strategy/src/tool_strategy/fill_bucket_tool_strategy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ namespace {
}
auto pxColour = canvas.getPixelColour(x, y);
if(pxColour) {
auto r = pxColour->r;
auto g = pxColour->r;
auto b = pxColour->r;
if (r == targetColour.r && g == targetColour.g && b == targetColour.b) {
if(pxColour == fillColour) {
return;
}

if (pxColour == targetColour) {
canvas.changePixel(x, y, fillColour);
flood(canvas, fillColour, targetColour, x + 1, y, count++);
flood(canvas, fillColour, targetColour, x - 1, y, count++);
Expand Down