Skip to content

Commit

Permalink
update Asset
Browse files Browse the repository at this point in the history
  • Loading branch information
yamader committed Dec 27, 2023
1 parent 12928fa commit 587b77d
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 15 deletions.
4 changes: 4 additions & 0 deletions src/engine/Asset.d
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ module engine.Asset;
import engine;

class Asset: Loggable {
// asset handling
package string locateAsset(string path) {
return "assets/" ~ path;
}
}
2 changes: 1 addition & 1 deletion src/engine/assets/AudioAsset.d
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ class AudioAsset: Asset {
Player player;

this(string path) {
sound = new Sound(path);
sound = new Sound(locateAsset(path));
}
}
2 changes: 1 addition & 1 deletion src/engine/assets/ImageAsset.d
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class ImageAsset: Asset {
private Image image;

this(string path) {
image = new Image(path);
image = new Image(locateAsset(path));
}

auto surface() => image.data;
Expand Down
2 changes: 1 addition & 1 deletion src/engine/assets/TextAsset.d
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class TextAsset: Asset {
int pt;

this(string path, int pt) {
this.font = new Font(path, pt);
this.font = new Font(locateAsset(path), pt);
this.pt = pt;
}

Expand Down
2 changes: 1 addition & 1 deletion src/engine/extra/DebugView.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class DebugView: GameObject {
auto tform = register(new Transform); // for Text
tform.pos = Vec2(8, 8);

auto font = new TextAsset("assets/PixelMplus-20130602/PixelMplus12-Regular.ttf", 16);
auto font = new TextAsset("PixelMplus-20130602/PixelMplus12-Regular.ttf", 16);
lt = register(new Text(font));
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/entities/Enemy.d
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import game;
class Enemy: GameObject {
int life;
int type;
immutable string imgdir = "assets/enemy.png";
immutable string imgdir = "enemy.png";
private const Vec2 initPos;

this(const Vec2 initPos = Vec2(0, 0)) {
Expand Down
2 changes: 1 addition & 1 deletion src/game/entities/Hero.d
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Hero: GameObject {
register(new Transform);
register(new RigidBody(1)).a = Vec2(0, 0);

auto hero0 = new ImageAsset("assets/hero0.png");
auto hero0 = new ImageAsset("hero0.png");
register(new SpriteRenderer(hero0));
}

Expand Down
4 changes: 2 additions & 2 deletions src/game/entities/Missile.d
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Missile: GameObject {
register(new Transform(Transform.Org.World)).pos = pos;
auto rb = register(new RigidBody(1));
rb.a = Vec2(0, 0);
auto missile = new ImageAsset("assets/hero0.png");
auto missile = new ImageAsset("hero0.png");
register(new SpriteRenderer(missile));

final switch(type) {
Expand All @@ -26,7 +26,7 @@ class Missile: GameObject {
break;
}

auto clip = new AudioAsset("assets/se_rifle01.mp3");
auto clip = new AudioAsset("se_rifle01.mp3");
// auto audio = register(new AudioSource(clip));
// audio.volume(20);
// audio.play();
Expand Down
2 changes: 1 addition & 1 deletion src/game/entities/UI.d
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class UI: GameObject {
// timers
register(new Transform);
component!Transform.pos = Vec2(400,0);
auto timerfont = new TextAsset("assets/PixelMplus-20130602/PixelMplus12-Regular.ttf",40);
auto timerfont = new TextAsset("PixelMplus-20130602/PixelMplus12-Regular.ttf",40);
timStr = register(new Text(timerfont));
t_start = uptime;
timStr.text = t_remain.to!string;
Expand Down
6 changes: 3 additions & 3 deletions src/game/stages/Home.d
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ class Home: Stage {
tform.scale.x = 1.5;

// vv background vv
bg = new ImageAsset("assets/_.jpeg");
bg = new ImageAsset("_.jpeg");
register(new SpriteRenderer(bg));

// vv userInterface vv
register(new UI);

// vv bgm vv
BGM = new AudioAsset("assets/maou_bgm_8bit29.ogg");
BGM = new AudioAsset("maou_bgm_8bit29.ogg");
audio = register(new AudioSource(BGM));
audio.play(-1);
audio.volume(15);
}
}
}
2 changes: 1 addition & 1 deletion src/game/stages/titleScene/TextBox.d
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TextBox: GameObject {
}

override void setup() {
auto font = new TextAsset("assets/PixelMplus-20130602/PixelMplus12-Regular.ttf", 40);
auto font = new TextAsset("PixelMplus-20130602/PixelMplus12-Regular.ttf", 40);
auto text = register(new Text(font));
text.text = s;

Expand Down
4 changes: 2 additions & 2 deletions src/game/stages/titleScene/TitleScene.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ class TitleScene: Stage {
override void setup(){
tform = register(new Transform(Transform.Org.World));
tform.scale.x = 1.5;
bg = new ImageAsset("assets/_.jpeg");
bg = new ImageAsset("_.jpeg");
register(new SpriteRenderer(bg));
BGM = new AudioAsset("assets/maou_bgm_8bit29.ogg");
BGM = new AudioAsset("maou_bgm_8bit29.ogg");
audio = register(new AudioSource(BGM));
audio.play(-1);
audio.volume(15);
Expand Down

0 comments on commit 587b77d

Please sign in to comment.