Skip to content

Commit

Permalink
picture and clear resources
Browse files Browse the repository at this point in the history
  • Loading branch information
vaclavblazej committed Feb 4, 2018
1 parent 9a5dd00 commit bbc25e4
Show file tree
Hide file tree
Showing 23 changed files with 12 additions and 122 deletions.
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Simple sokoban puzzle game

As a demonstration of simplistic game with **lwjgl**.
As a demonstration of a simplistic game with **lwjgl**.

## Description
Each map is played on a round-like manner on a rectangular grid.
Expand All @@ -13,9 +13,14 @@ Use **Arrow** keys to move, use **R** to reset the level.
What is complete:
* described play mechanics
* player controls
* win condition
* win conditiono
* several maps

What will be ommited
What was ommited
* menu
* settings

## Picture

<img alt="Nový sloupec hodnocení" src="./pics/example.png"/>

Binary file added pics/example.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<mainClass>cz.cvut.fit.blazeva.${class}</mainClass>
</transformer>
</transformers>
<finalName>sokoban</finalName>
<!--<finalName>sokoban</finalName>-->
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/cz/cvut/fit/blazeva/app/control/Logic.java
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private void updateControls() {
public void initialize() throws IOException {
// createCubemapTexture();
// createFullScreenQuad();
program.initializePrograms();
// program.initializePrograms();
drawer.createEntities();
}

Expand Down
5 changes: 1 addition & 4 deletions src/main/java/cz/cvut/fit/blazeva/app/control/Scenario.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import java.util.ArrayList;
import java.util.List;

import static cz.cvut.fit.blazeva.util.DemoUtils.ioResourceToByteBuffer;

public class Scenario {

public enum TileTypes {
Expand All @@ -34,14 +32,13 @@ public enum TileTypes {
public Scenario(String name) {
won = false;
try {
URL url = Thread.currentThread().getContextClassLoader().getResource("cz/cvut/fit/blazeva/levels/" + name);
URL url = Scenario.class.getClassLoader().getResource("cz/cvut/fit/blazeva/levels/" + name);
System.out.println("loading scenario " + name);
File file = new File(url.getFile());
try (BufferedReader br = new BufferedReader(new FileReader(file))) {
String line;
line = br.readLine();
size = Integer.parseInt(line);
System.out.println("map size: " + size);
map = new TileTypes[size][size];
for (int j = size-1; j >= 0 && (line = br.readLine()) != null; --j) {
for (int i = 0; i < line.length(); ++i) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/cz/cvut/fit/blazeva/app/view/Window.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void invoke(long window, int button, int action, int mods) {
if (!Model.caps.OpenGL20) {
throw new AssertionError("This demo requires OpenGL 2.0.");
}
debugProc = GLUtil.setupDebugMessageCallback();
// debugProc = GLUtil.setupDebugMessageCallback();

logic.initialize();

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
14 changes: 0 additions & 14 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/cubemap.fs

This file was deleted.

22 changes: 0 additions & 22 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/cubemap.vs

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/particle.fs

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/particle.vs

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/ship.fs

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/ship.vs

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/shot.fs

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/resources/cz/cvut/fit/blazeva/shaders/shot.vs

This file was deleted.

0 comments on commit bbc25e4

Please sign in to comment.