Skip to content

Commit a88f51b

Browse files
committed
Added Map File
1 parent 68ec2dc commit a88f51b

File tree

3 files changed

+57
-33
lines changed

3 files changed

+57
-33
lines changed

.idea/workspace.xml

+19-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/Game/Map.java

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package Game;
2+
3+
import ObsidianEngine.entity.Mesh;
4+
import ObsidianEngine.entity.Plane;
5+
import ObsidianEngine.render.Shader;
6+
import ObsidianEngine.render.Texture;
7+
import ObsidianEngine.utils.ColorUtils;
8+
import org.joml.Vector2f;
9+
import org.joml.Vector3f;
10+
11+
import java.util.ArrayList;
12+
13+
public class Map {
14+
public static void getMap(float size,float incerment, ArrayList<Mesh> Meshes){
15+
Vector2f startPos = new Vector2f(-size,-size);
16+
while (startPos.y < size){
17+
while (startPos.x < size) {
18+
//Create Squares
19+
Mesh Ground = new Plane(incerment,incerment,new Vector3f(startPos.x,0,startPos.y), ColorUtils.Green);
20+
Ground.setTexture(new Texture("/imgs/Grass.jpg",true));
21+
Ground.setShader(Shader.defaultTextureShader);
22+
Ground.Create();
23+
Meshes.add(Ground);
24+
25+
System.out.println("Map Space @ " + startPos.x + "," + startPos.y);
26+
27+
startPos.x += incerment;
28+
}
29+
startPos.y += incerment;
30+
startPos.x = -size;
31+
}
32+
}
33+
}

src/main/java/ObsidianEngine/io/Window.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package ObsidianEngine.io;
22

3+
import Game.Map;
34
import ObsidianEngine.entity.Box;
45
import ObsidianEngine.entity.Mesh;
56
import ObsidianEngine.entity.Plane;
@@ -10,6 +11,7 @@
1011
import ObsidianEngine.utils.FileUtils;
1112
import ObsidianEngine.utils.MouseUtils;
1213
import ObsidianEngine.utils.TimeUtils;
14+
import org.joml.Vector2f;
1315
import org.joml.Vector3f;
1416
import org.lwjgl.BufferUtils;
1517
import org.lwjgl.Version;
@@ -120,12 +122,9 @@ private void init(){
120122
MouseUtils.SetCursorImage(GLFWWindow,"/imgs/Crosshair.png");
121123

122124
//Starting Meshes & Models
123-
//Ground
124-
Mesh Ground = new Plane(50,50,new Vector3f(0,0,0), ColorUtils.Green);
125-
Ground.setTexture(new Texture("/imgs/Grass.jpg",true));
126-
Ground.setShader(Shader.defaultTextureShader);
127-
Ground.Create();
128-
Meshes.add(Ground);
125+
//Load Map
126+
Map.getMap(100,50,Meshes);
127+
129128

130129
Player = FileUtils.LoadOBJWTexture("/models/Link.obj", Meshes, new Texture("/imgs/PlayerTexture.png"));
131130
Player.setScale(5);

0 commit comments

Comments
 (0)