tollyx/dungeon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename Tileset to SpriteAtlas

Browse source
This commit is contained in:
Adrian Hedqvist 2017-12-31 21:51:57 +01:00
parent a12e3b53f2
commit 1cf3ec5fc0
8 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dungeon.vcxproj
View file

@ -154,7 +154,7 @@
<ClCompile Include="src\Rng.cpp" />
<ClCompile Include="src\Shaman.cpp" />
<ClCompile Include="src\Tilemap.cpp" />
<ClCompile Include="src\Tileset.cpp" />
<ClCompile Include="src\SpriteAtlas.cpp" />
<ClCompile Include="src\WanderNode.cpp" />
<ClCompile Include="src\World.cpp" />
</ItemGroup>
@ -203,7 +203,7 @@
<ClInclude Include="src\stb_textedit.h" />
<ClInclude Include="src\stb_truetype.h" />
<ClInclude Include="src\Tilemap.h" />
<ClInclude Include="src\Tileset.h" />
<ClInclude Include="src\SpriteAtlas.h" />
<ClInclude Include="src\vec2i.h" />
<ClInclude Include="src\WanderNode.h" />
<ClInclude Include="src\wglew.h" />

12
dungeon.vcxproj.filters
View file

@ -123,9 +123,6 @@
<ClCompile Include="src\Tilemap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Tileset.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\WanderNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -138,6 +135,9 @@
<ClCompile Include="src\Shader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\SpriteAtlas.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\Actor.h">
@ -266,9 +266,6 @@
<ClInclude Include="src\Tilemap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Tileset.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\vec2i.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -287,5 +284,8 @@
<ClInclude Include="src\Shader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\SpriteAtlas.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
src/PlayState.cpp
View file

@ -7,7 +7,7 @@
#include "Renderer.h"
#include "Actor.h"
#include "App.h"
#include "Tileset.h"
#include "SpriteAtlas.h"
#include "Mapgen.h"
#include "FieldOfView.h"
#include "imgui.h"
@ -22,7 +22,7 @@ InputAction player_action;
void PlayState::load() {
SDL_LogVerbose(SDL_LOG_CATEGORY_SYSTEM, "Creating ascii tileset...\n");
ascii = new Tileset(app->renderer, "./assets/12x12.bmp", 192, 192, 12, 12);
ascii = new SpriteAtlas(app->renderer, "./assets/12x12.bmp", 192, 192, 12, 12);
SDL_LogVerbose(SDL_LOG_CATEGORY_SYSTEM, "Created ascii tileset.\n");
app->input->bind_key(SDLK_ESCAPE, ACTION_ESCAPE_MENU);

4
src/PlayState.h
View file

@ -4,11 +4,11 @@
#include "Tilemap.h"
#include "FieldOfView.h"
class Tileset;
class SpriteAtlas;
class Actor;
class PlayState : public Gamestate {
Tileset* ascii;
SpriteAtlas* ascii;
Tilemap tilemap;
Actor * player_actor;
FieldOfView fov;

14
src/Tileset.cpp → src/SpriteAtlas.cpp
View file

@ -1,7 +1,7 @@
#include "Tileset.h"
#include "SpriteAtlas.h"
#include "Renderer.h"
Tileset::Tileset(Renderer* renderer, std::string imgPath, int imgWidth, int imgHeight, int tileWidth, int tileHeight) {
SpriteAtlas::SpriteAtlas(Renderer* renderer, std::string imgPath, int imgWidth, int imgHeight, int tileWidth, int tileHeight) {
int tilesX = imgWidth / tileWidth;
int tilesY = imgHeight / tileHeight;
tile_width = tileWidth;
@ -20,25 +20,25 @@ Tileset::Tileset(Renderer* renderer, std::string imgPath, int imgWidth, int imgH
}
}
Tileset::~Tileset() {
SpriteAtlas::~SpriteAtlas() {
delete sprites;
}
int Tileset::get_amount() {
int SpriteAtlas::get_amount() {
return amount;
}
Sprite * Tileset::get_sprite(int tileId) {
Sprite * SpriteAtlas::get_sprite(int tileId) {
if (tileId >= 0 && tileId < amount) {
return &sprites[tileId];
}
return nullptr;
}
int Tileset::get_tile_width() {
int SpriteAtlas::get_tile_width() {
return tile_width;
}
int Tileset::get_tile_height() {
int SpriteAtlas::get_tile_height() {
return tile_height;
}

6
src/Tileset.h → src/SpriteAtlas.h
View file

@ -5,14 +5,14 @@ class Renderer;
struct Sprite;
// Automatically splits a tileset image to seperate sprites.
class Tileset {
class SpriteAtlas {
Sprite* sprites;
int amount;
int tile_width;
int tile_height;
public:
Tileset(Renderer* renderer, std::string imgPath, int imgWidth, int imgHeight, int tileWidth, int tileHeight);
~Tileset();
SpriteAtlas(Renderer* renderer, std::string imgPath, int imgWidth, int imgHeight, int tileWidth, int tileHeight);
~SpriteAtlas();
int get_amount();
int get_tile_width();
int get_tile_height();

16
src/Tilemap.cpp
View file

@ -2,7 +2,7 @@
#include "vec2i.h"
#include "Actor.h"
#include "Renderer.h"
#include "Tileset.h"
#include "SpriteAtlas.h"
#include "FieldOfView.h"
#include <SDL2/SDL.h>
@ -16,11 +16,7 @@ Tilemap::Tilemap(int width, int height) {
tilemap = std::vector<unsigned int>(width*height, 0);
}
Tilemap::~Tilemap() {
for (auto var : actors) {
delete var;
}
}
Tilemap::~Tilemap() {}
int Tilemap::get_width() {
return width;
@ -128,7 +124,13 @@ std::vector<Actor*>* Tilemap::get_actor_list() {
return &actors;
}
void Tilemap::draw(Renderer *renderer, Tileset* tileset, int x, int y, int tx, int ty, int tw, int th, FieldOfView* view) {
void Tilemap::delete_actors() {
for (auto var : actors) {
delete var;
}
}
void Tilemap::draw(Renderer *renderer, SpriteAtlas* tileset, int x, int y, int tx, int ty, int tw, int th, FieldOfView* view) {
int w = tileset->get_tile_width();
int h = tileset->get_tile_height();
for (int ix = 0; ix < tw; ix++) {

5
src/Tilemap.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <array>
#include <vector>
#include "Tileset.h"
#include "SpriteAtlas.h"
#include "Actor.h"
struct vec2i;
@ -26,7 +26,7 @@ public:
int get_tile(int x, int y);
bool is_blocked(int x, int y); // Checks if there is an actor blocking the tile.
void draw(Renderer *renderer, Tileset *tileset, int x, int y, int tx, int ty, int tw, int th, FieldOfView* view);
void draw(Renderer *renderer, SpriteAtlas *tileset, int x, int y, int tx, int ty, int tw, int th, FieldOfView* view);
void add_actor(Actor *actor);
void remove_actor(Actor *actor);
@ -36,5 +36,6 @@ public:
Entity* get_entity(int x, int y, EntityTypes type);
std::vector<Actor*> get_actors(int x, int y, int range);
std::vector<Actor*>* get_actor_list();
void delete_actors();
};