Fixed variable desktop resolution problems

JingYiJun · May 30, 2022 · 615a153 · 615a153
1 parent 6ab04ff
commit 615a153
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ CXX_FLAGS=-g -static -std=c++17 -Wall -O2 -DSFML_STATIC #-Wl,--stack=268435456
 rm=rm -fr
 mkdir=mkdir2 -p
 
-TARGET=main
+TARGET=sfSnakePro
 BUILD_DIR=build
 SRC_DIR= src src/screen src/element
 SRCS = $(foreach dir, $(SRC_DIR), $(wildcard $(dir)/*.cpp))

diff --git a/src/element/Fruit.cpp b/src/element/Fruit.cpp
@@ -5,12 +5,10 @@
 
 using namespace sfSnake;
 
-float Fruit::Radius = 5.0f;
-
 Fruit::Fruit(sf::Vector2f position, sf::Color color, int score)
     : score_(score)
 {
-    shape_.setRadius(Fruit::Radius);
+    shape_.setRadius(Game::GlobalVideoMode.width / 256.0f);
     setOriginMiddle(shape_);
     shape_.setPosition(position);
     shape_.setFillColor(color);

diff --git a/src/element/Fruit.h b/src/element/Fruit.h
@@ -8,7 +8,6 @@ namespace sfSnake
     {
         sf::CircleShape shape_;
         int score_;
-        static float Radius;
 
         Fruit(sf::Vector2f position, sf::Color color, int score);
 

diff --git a/src/element/Snake.cpp b/src/element/Snake.cpp
@@ -138,7 +138,7 @@ void Snake::checkFruitCollisions(std::deque<Fruit> &fruits)
     {
         if (dis(
                 i->shape_.getPosition(), toWindow(headnode)) <
-            nodeRadius_ + i->Radius)
+            nodeRadius_ + i->shape_.getRadius())
             toRemove = i;
     }
 

diff --git a/src/element/TitleSprite.cpp b/src/element/TitleSprite.cpp
@@ -13,7 +13,7 @@ TitleSprite::TitleSprite()
     titleSprite_.setTexture(titleTexture_);
 
     sf::FloatRect titleSpriteBounds = setOriginMiddle(titleSprite_);
-    titleSprite_.setScale(titleSpriteBounds.width / Game::GlobalVideoMode.width / 5.0 * 4.0, titleSpriteBounds.width / Game::GlobalVideoMode.width / 5.0 * 4.0);
+    titleSprite_.setScale(Game::GlobalVideoMode.width / titleSpriteBounds.width * 0.5f, Game::GlobalVideoMode.width / titleSpriteBounds.width * 0.5f);
     titleSprite_.setPosition(Game::GlobalVideoMode.width / 2, Game::GlobalVideoMode.height / 4);
 }