Skip to content

Commit 32c2aea

Browse files
committed
Framework lesson transferred into the course
Task descriptions and tests in progress.
1 parent 303c937 commit 32c2aea

File tree

159 files changed

+5318
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+5318
-30
lines changed

ObjectOrientedProgramming/ClassesAndObjects/CollisionsRevisited/src/dynscene.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,10 @@ void GameplayDynamicScene::draw(sf::RenderWindow &window, TextureManager& textur
142142
});
143143
}
144144

145+
void GameplayDynamicScene::updateScore() {
146+
// Will be implemented in future lessons
147+
}
148+
149+
void GameplayDynamicScene::updatePlayerStatus() {
150+
// Will be implemented in future lessons
151+
}

ObjectOrientedProgramming/ClassesAndObjects/CollisionsRevisited/src/player.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,9 @@ const sf::Texture* PlayerObject::getTexture(TextureManager& textureManager) cons
5151

5252
void PlayerObject::onCollision(const GameObject &object, const CollisionInfo &info) {
5353
// TODO: write your solution here
54-
}
54+
}
55+
56+
unsigned int PlayerObject::getScore() const {
57+
// Will be implemented in future lessons
58+
return 0;
59+
}

ObjectOrientedProgramming/ClassesAndObjects/CollisionsRevisited/src/scene.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,12 @@ void Scene::drawBackground(sf::RenderWindow &window, const sf::Texture* texture)
4444
background.setTexture(*texture);
4545
background.setTextureRect(sf::IntRect(0, 0, width, height));
4646
window.draw(background);
47-
}
47+
}
48+
49+
void Scene::updateScore(unsigned int value) {
50+
// Will be implemented in future lessons
51+
}
52+
53+
void Scene::updatePlayerStatus(bool alive) {
54+
// Will be implemented in future lessons
55+
}

ObjectOrientedProgramming/ClassesAndObjects/CollisionsRevisited/src/statscene.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,12 @@ void GameplayStaticScene::draw(sf::RenderWindow &window, TextureManager& texture
4343
player.draw(window, textureManager);
4444
consumable.draw(window, textureManager);
4545
enemy.draw(window, textureManager);
46-
}
46+
}
47+
48+
void GameplayStaticScene::updateScore() {
49+
// Will be implemented in future lessons
50+
}
51+
52+
void GameplayStaticScene::updatePlayerStatus() {
53+
// Will be implemented in future lessons
54+
}

ObjectOrientedProgramming/ClassesAndObjects/CollisionsRevisited/src/textures.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ const char* getTextureFilename(GameTextureID id) {
1616
return "resources/starConcerned.png";
1717
case GameTextureID::BLACKHOLE:
1818
return "resources/blackhole.png";
19+
case GameTextureID::LEADERBOARD:
20+
return "resources/leaderboardFrame.png";
1921
default:
2022
return "";
2123
}

ObjectOrientedProgramming/ClassesAndObjects/Encapsulation/src/dynscene.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,10 @@ void GameplayDynamicScene::draw(sf::RenderWindow &window, TextureManager& textur
142142
});
143143
}
144144

145+
void GameplayDynamicScene::updateScore() {
146+
// Will be implemented in future lessons
147+
}
148+
149+
void GameplayDynamicScene::updatePlayerStatus() {
150+
// Will be implemented in future lessons
151+
}

ObjectOrientedProgramming/ClassesAndObjects/Encapsulation/src/player.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,9 @@ const sf::Texture* PlayerObject::getTexture(TextureManager& textureManager) cons
5151

5252
void PlayerObject::onCollision(const GameObject &object, const CollisionInfo &info) {
5353
// TODO: write your solution here
54-
}
54+
}
55+
56+
unsigned int PlayerObject::getScore() const {
57+
// Will be implemented in future lessons
58+
return 0;
59+
}

ObjectOrientedProgramming/ClassesAndObjects/Encapsulation/src/scene.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,12 @@ void Scene::drawBackground(sf::RenderWindow &window, const sf::Texture* texture)
4444
background.setTexture(*texture);
4545
background.setTextureRect(sf::IntRect(0, 0, width, height));
4646
window.draw(background);
47-
}
47+
}
48+
49+
void Scene::updateScore(unsigned int value) {
50+
// Will be implemented in future lessons
51+
}
52+
53+
void Scene::updatePlayerStatus(bool alive) {
54+
// Will be implemented in future lessons
55+
}

ObjectOrientedProgramming/ClassesAndObjects/Encapsulation/src/statscene.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,12 @@ void GameplayStaticScene::draw(sf::RenderWindow &window, TextureManager& texture
4343
player.draw(window, textureManager);
4444
consumable.draw(window, textureManager);
4545
enemy.draw(window, textureManager);
46-
}
46+
}
47+
48+
void GameplayStaticScene::updateScore() {
49+
// Will be implemented in future lessons
50+
}
51+
52+
void GameplayStaticScene::updatePlayerStatus() {
53+
// Will be implemented in future lessons
54+
}

ObjectOrientedProgramming/ClassesAndObjects/Encapsulation/src/textures.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ const char* getTextureFilename(GameTextureID id) {
1616
return "resources/starConcerned.png";
1717
case GameTextureID::BLACKHOLE:
1818
return "resources/blackhole.png";
19+
case GameTextureID::LEADERBOARD:
20+
return "resources/leaderboardFrame.png";
1921
default:
2022
return "";
2123
}

0 commit comments

Comments
 (0)