Skip to content

Commit 9b441d6

Browse files
Alvarwow69Alvarwow69
committed
Update to SWEngine alpha-0.2
1 parent 83831d2 commit 9b441d6

14 files changed

Lines changed: 21 additions & 94 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ set( INC_FOLDERS
4242
)
4343

4444
message(${PREFIX_MESSAGE} "Build type set to: " ${CMAKE_BUILD_TYPE})
45+
message(${PREFIX_MESSAGE} "Current cmake location: " ${CMAKE_CURRENT_SOURCE_DIR})
46+
message(${PREFIX_MESSAGE} "Project location: " ${CMAKE_SOURCE_DIR})
4547

4648
if (WIN32)
4749
message(${PREFIX_MESSAGE} "Windows system detected, prepare project...")

‎out/Debug/Save/Main.fish‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,8 @@ manager:
450450
active: true
451451
components:
452452
- entity_name: MainCamera
453-
audioFile: Menu
454-
volume: 0.0
455-
pitch: 1
453+
volume: 0
454+
pitch: 0
456455
playOnStart: true
457456
layer:
458457
- name: MainCamera

‎out/Debug/Save/MainFile.fish‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -206,40 +206,6 @@ entities:
206206
- 1
207207
- 0
208208
parent: Background
209-
- name: Rect
210-
active: true
211-
transform:
212-
entity_name: Rect
213-
position:
214-
- 0
215-
- 0
216-
- 0
217-
scale:
218-
- 1
219-
- 1
220-
- 1
221-
angle: 0
222-
rotation_axis:
223-
- 0
224-
- 1
225-
- 0
226-
- name: RenderTexture
227-
active: true
228-
transform:
229-
entity_name: RenderTexture
230-
position:
231-
- 50
232-
- 0
233-
- 0
234-
scale:
235-
- 1
236-
- 1
237-
- 1
238-
angle: 0
239-
rotation_axis:
240-
- 0
241-
- 1
242-
- 0
243209
manager:
244210
- name: SpriteManager
245211
valid: true
@@ -389,24 +355,6 @@ manager:
389355
shader:
390356
fragment: resources/shaders/fragment_shader.glsl
391357
vertex: resources/shaders/vertex_shader.glsl
392-
- entity_name: RenderTexture
393-
invertX: false
394-
invertY: false
395-
rect:
396-
- 900
397-
- 900
398-
- 500
399-
- 500
400-
color:
401-
r: 0
402-
g: 0
403-
b: 0
404-
a: 255
405-
material:
406-
textureName: RenderTexture
407-
shader:
408-
fragment: resources/shaders/fragment_shader.glsl
409-
vertex: resources/shaders/vertex_shader.glsl
410358
layer:
411359
- name: LastBG1
412360
index: 0
@@ -416,8 +364,6 @@ manager:
416364
index: 0
417365
- name: Opossum
418366
index: 0
419-
- name: RenderTexture
420-
index: 0
421367
- name: House
422368
index: 1
423369
- name: Frog
@@ -558,20 +504,12 @@ manager:
558504
valid: true
559505
active: true
560506
components:
561-
- entity_name: Rect
562-
fov: 45
563-
size: 1
564-
clipNear: 0.100000001
565-
clipFar: 1000
566-
type: 1
567507
- entity_name: MainCamera
568508
fov: 45
569509
size: 1
570510
clipNear: -1
571511
clipFar: 1000
572512
type: 1
573513
layer:
574-
- name: Rect
575-
index: -1
576514
- name: MainCamera
577515
index: 0

‎out/Debug/resources/shaders/fragment_shader.glsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#version 460 core
2-
layout(location = 0) out vec4 FragColor;
2+
out vec4 FragColor;
33

44
in vec4 ourColor;
55
in vec2 TexCoord;

‎out/Release/Save/Main.fish‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,8 @@ manager:
450450
active: true
451451
components:
452452
- entity_name: MainCamera
453-
audioFile: Menu
454-
volume: 0.5
455-
pitch: 1
453+
volume: 0
454+
pitch: 0
456455
playOnStart: true
457456
layer:
458457
- name: MainCamera

‎sources/Project.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ void sw::CreateScenes()
1818
auto main = new Main();
1919
auto mainfile = new MainFile();
2020
sw::OpenGLModule::eventManager().create("SceneLoad");
21-
sw::OpenGLModule::sceneManager().createScene("MainFile", "Save/Main.fish");
2221
sw::OpenGLModule::sceneManager().createScene("Main");
22+
sw::OpenGLModule::sceneManager().createScene("MainFile");
2323
sw::OpenGLModule::sceneManager().createScene("Game");
2424

2525
sw::OpenGLModule::eventManager()["SceneLoad"].subscribe(game, &Game::onLoad);

‎sources/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ try
1717

1818
sw::CreateScenes();
1919
sw::OpenGLModule::load();
20-
sw::OpenGLModule::sceneManager().loadScene("MainFile");
20+
sw::OpenGLModule::sceneManager().loadScene("Main");
2121
sw::Speech::flush();
22-
while (sw::OpenGLModule::isOk())
22+
while (sw::OpenGLModule::isRunning())
2323
sw::OpenGLModule::update();
2424
sw::Speech::flush();
2525
sw::OpenGLModule::unload();

‎sources/scenes/Game.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ void Game::onLoad(sw::EventInfo& info)
3030
if (scene.name != "Game")
3131
return;
3232
scene.eventManager.create("Collision");
33-
scene.createManager<sw::SpriteManager>("SpriteManager");
34-
scene.createManager<sw::AnimatorManager>("AnimatorManager");
35-
scene.createManager<sw::CameraManager>("CameraManager");
36-
scene.createManager<sw::ScriptManager>("ScriptManager");
37-
scene.createManager<sw::BoxColliderManager>("BoxColliderManager");
38-
scene.createManager<sw::RigidBody2DManager>("RigidBody2DManager");
3933

4034
auto& entity = scene.createGameObject("Background");
4135
auto& mainCamera = scene.createGameObject("MainCamera");
@@ -63,7 +57,7 @@ void Game::onLoad(sw::EventInfo& info)
6357
entity.createComponent<inc::BackgroundManager>("ScriptManager");
6458
//mainCamera.addChild(entity.name());
6559
camera.setClippingNear(-1);
66-
scene.eventManager.drop("Start");
60+
//scene.eventManager.drop("Start");
6761
gem1.transform().setPosition(1000, 550);
6862
gem2.transform().setPosition(1450, 830);
6963
gem3.transform().setPosition(2600, 780);

‎sources/scenes/Main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void Main::onLoad(sw::EventInfo& info)
4141
sw::ConcreteComponent auto& camera = mainCamera.createComponent<sw::Camera>("CameraManager");
4242
sw::ConcreteComponent auto& camAudio = mainCamera.createComponent<sw::AudioSource>("AudioManager");
4343
//camAudio.addAudio("Bonus_1").addAudio("Bonus_2").addAudio("Bonus_3").addAudio("Bonus_4").setVolume(.5f).setRandomized(true).setMaxOccurence(1).play();
44-
camAudio.setAudio("Menu").setVolume(.5f).play();
44+
camAudio.addAudio("Menu").setVolume(.0f).play();
4545
std::string foo("MapMenu");
4646
std::string ye("Incaribus");
4747
std::string subtitleT("Press SPACE to start the game");

‎sources/scenes/MainFile.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,5 @@ void MainFile::onLoad(sw::EventInfo& info)
2929
player.createComponent<Player>("ScriptManager");
3030
opossum.createComponent<inc::Opossum>("ScriptManager");
3131

32-
auto& cam = scene.getGameObject("MainCamera");
33-
scene.createGameObject("Rect").createComponent<sw::Camera>("CameraManager").createRenderTexture("RenderTexture");
34-
cam.transform().move(0, 0);
35-
36-
auto& go = scene.createGameObject("RenderTexture");
37-
auto& sprite = go.createComponent<sw::Sprite>("SpriteManager");
38-
std::string sp = "RenderTexture";
39-
sw::FloatRect rect = {900, 900, 500, 500};
40-
sprite.setTexture(sp).setTextureRect(rect);
41-
go.transform().move(50, 0);
42-
4332
entity.createComponent<inc::BackgroundManager>("ScriptManager").start();
4433
}

0 commit comments

Comments
 (0)