diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | engine/enemy.cpp | 4 | ||||
| -rw-r--r-- | engine/engine.cpp | 4 | ||||
| -rw-r--r-- | engine/player.cpp | 4 | ||||
| -rw-r--r-- | engine/stage.cpp | 4 | ||||
| m--------- | wriggle | 0 |
6 files changed, 9 insertions, 9 deletions
@@ -15,7 +15,7 @@ if env['PLATFORM'] == 'darwin': env.Append(CPPPATH = ['.', '/opt/local/include', '/opt/local/include/freetype2']) env.Append(LIBS = ['ftgl']) env.Append(LIBPATH = ['/opt/local/lib']) - env.Append(FRAMEWORKS = ['sfml-system', 'sfml-window', 'SDL', 'SDL_image', 'OpenGL']) + env.Append(FRAMEWORKS = ['sfml-system', 'sfml-window', 'OpenGL']) else: env.Append(CPPPATH = ['.']) env.Append(LIBS = ['GL', 'GLU', 'SDL', 'SDL_image']) diff --git a/engine/enemy.cpp b/engine/enemy.cpp index 383ddc7..0f0c32f 100644 --- a/engine/enemy.cpp +++ b/engine/enemy.cpp @@ -1,13 +1,13 @@ #include "enemy.h" -#include <wriggle/texturesdl.h> +#include <wriggle/texturestbi.h> #include <SDL/SDL_opengl.h> Enemy::Enemy(const Vector2& initpos, std::vector<BulletPattern*>& stage_patterns) : patterns(stage_patterns) { pos = initpos; - texture = new TextureSDL("textures/enemy.png"); + texture = new TextureSTBI("textures/enemy.png"); } void Enemy::update() { diff --git a/engine/engine.cpp b/engine/engine.cpp index 278007e..0c54bae 100644 --- a/engine/engine.cpp +++ b/engine/engine.cpp @@ -2,7 +2,7 @@ #include "config.h" -#include <wriggle/texturesdl.h> +#include <wriggle/texturestbi.h> #include <SDL/SDL_opengl.h> @@ -46,7 +46,7 @@ Engine::Engine() { font = new FTTextureFont("fonts/VeraMono.ttf"); font->FaceSize(20); - background = new TextureSDL("textures/background.png"); + background = new TextureSTBI("textures/background.png"); paused = false; } diff --git a/engine/player.cpp b/engine/player.cpp index 091f874..4b09890 100644 --- a/engine/player.cpp +++ b/engine/player.cpp @@ -2,7 +2,7 @@ #include <cmath> #include "player.h" -#include <wriggle/texturesdl.h> +#include <wriggle/texturestbi.h> #include "config.h" Player::Player() { @@ -10,7 +10,7 @@ Player::Player() { y = 0.1; move_factor = 0.005; focus_factor = 0.5; - texture = new TextureSDL("textures/player.png"); + texture = new TextureSTBI("textures/player.png"); } void Player::draw() { diff --git a/engine/stage.cpp b/engine/stage.cpp index 46e18a8..0026119 100644 --- a/engine/stage.cpp +++ b/engine/stage.cpp @@ -2,7 +2,7 @@ #include "config.h" -#include <wriggle/texturesdl.h> +#include <wriggle/texturestbi.h> #include <SDL/SDL_opengl.h> #include <cmath> @@ -12,7 +12,7 @@ Stage::Stage() { player = new Player(); - texture = new TextureSDL("textures/shot1.png"); + texture = new TextureSTBI("textures/shot1.png"); shader = new GLShaderProgram(); enemy_list.push_back(new Enemy1(Vector2(0.25, 0.75), patterns)); diff --git a/wriggle b/wriggle -Subproject bf4827f46f22b4df0fa2ddd6716fd59247f9e1b +Subproject 8e0a72184085aa6e3e741ad5d79f5db2e63d63a |