From 0403d0d64656c45db6e069aa465dfa44d91dd25f Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Wed, 31 Mar 2021 22:15:50 +0900 Subject: [PATCH] WIP Some tweaks Add define macro for DEFAULT_WIDTH and DEFAULT_HEIGHT. Disable drawing outline for Tris. --- src/helpers.hpp | 2 ++ src/state.cpp | 4 ++-- src/triangle.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/helpers.hpp b/src/helpers.hpp index c71b3d0..2dea997 100644 --- a/src/helpers.hpp +++ b/src/helpers.hpp @@ -14,6 +14,8 @@ #define SHOW_HELP_WIDTH (state->get_width() / 2.0f) #define SHOW_HELP_HEIGHT (state->get_height() / 2.0f) +#define DEFAULT_WIDTH 800 +#define DEFAULT_HEIGHT 600 #define CHANGE_SIZE_MIN_X 800 #define CHANGE_SIZE_MAX_X 1920 #define CHANGE_SIZE_MIN_Y 600 diff --git a/src/state.cpp b/src/state.cpp index 908c9ff..74861fb 100644 --- a/src/state.cpp +++ b/src/state.cpp @@ -13,8 +13,8 @@ #define STARTING_HELP_FADE_RATE 0.2f Tri::State::State(int argc, char **argv) : -width(800), -height(600), +width(DEFAULT_WIDTH), +height(DEFAULT_HEIGHT), dt(1.0f/60.0f), notificationAlpha(1.0f), trisIndex(0), diff --git a/src/triangle.cpp b/src/triangle.cpp index b7a6126..0a55a61 100644 --- a/src/triangle.cpp +++ b/src/triangle.cpp @@ -35,11 +35,11 @@ Tri::Shape& Tri::Triangle::draw() { {transformed[1].x, transformed[1].y}, {transformed[2].x, transformed[2].y}, fillColor); - DrawTriangleLines( - {transformed[0].x, transformed[0].y}, - {transformed[1].x, transformed[1].y}, - {transformed[2].x, transformed[2].y}, - outlineColor); +// DrawTriangleLines( +// {transformed[0].x, transformed[0].y}, +// {transformed[1].x, transformed[1].y}, +// {transformed[2].x, transformed[2].y}, +// outlineColor); return *this; }