halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

should be the final move of engine classes

pull/12/head
hYdos 2020-03-02 16:38:46 +10:00
parent 6db7693bc3
commit 2b4b1aa4d0
24 changed files with 53 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/github/halotroop/litecraft/Litecraft.java
View File

@ -12,11 +12,11 @@ import com.github.hydos.ginger.engine.common.api.GingerRegister;
import com.github.hydos.ginger.engine.common.api.game.*;
import com.github.hydos.ginger.engine.common.cameras.*;
import com.github.hydos.ginger.engine.common.elements.objects.*;
import com.github.hydos.ginger.engine.common.font.FontType;
import com.github.hydos.ginger.engine.common.io.Window;
import com.github.hydos.ginger.engine.common.obj.ModelLoader;
import com.github.hydos.ginger.engine.common.obj.shapes.StaticCube;
import com.github.hydos.ginger.engine.opengl.api.*;
import com.github.hydos.ginger.engine.opengl.font.FontType;
import com.github.hydos.ginger.engine.opengl.render.MasterRenderer;
import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel;
import com.github.hydos.ginger.engine.opengl.utils.GlLoader;

4
src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java
View File

@ -2,10 +2,10 @@ package com.github.halotroop.litecraft.screens;
import org.joml.*;
import com.github.hydos.ginger.engine.common.font.GUIText;
import com.github.hydos.ginger.engine.common.io.Window;
import com.github.hydos.ginger.engine.common.screen.Screen;
import com.github.hydos.ginger.engine.opengl.api.*;
import com.github.hydos.ginger.engine.opengl.font.GUIText;
import com.github.hydos.ginger.engine.opengl.screen.Screen;
public class ExitGameScreen extends Screen
{

4
src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java
View File

@ -4,9 +4,9 @@ import org.joml.*;
import com.github.halotroop.litecraft.Litecraft;
import com.github.hydos.ginger.engine.common.api.GingerRegister;
import com.github.hydos.ginger.engine.common.font.GUIText;
import com.github.hydos.ginger.engine.common.screen.Screen;
import com.github.hydos.ginger.engine.opengl.api.*;
import com.github.hydos.ginger.engine.opengl.font.GUIText;
import com.github.hydos.ginger.engine.opengl.screen.Screen;
public class IngameHUD extends Screen
{

4
src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java
View File

@ -9,10 +9,10 @@ import com.github.halotroop.litecraft.save.LitecraftSave;
import com.github.halotroop.litecraft.world.dimension.Dimensions;
import com.github.hydos.ginger.engine.common.elements.GuiTexture;
import com.github.hydos.ginger.engine.common.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.common.font.GUIText;
import com.github.hydos.ginger.engine.common.io.Window;
import com.github.hydos.ginger.engine.common.screen.Screen;
import com.github.hydos.ginger.engine.opengl.api.GingerGL;
import com.github.hydos.ginger.engine.opengl.font.GUIText;
import com.github.hydos.ginger.engine.opengl.screen.Screen;
/**
* YeS

54
src/main/java/com/github/halotroop/litecraft/world/block/BlockRenderer.java
View File

@ -17,11 +17,9 @@ import com.github.hydos.ginger.engine.opengl.utils.GlLoader;
public class BlockRenderer extends Renderer implements WorldGenConstants
{
private StaticShader shader;
public int atlasID;
public BlockRenderer(StaticShader shader, Matrix4f projectionMatrix)
{
this.shader = shader;
@ -33,7 +31,8 @@ public class BlockRenderer extends Renderer implements WorldGenConstants
private void prepBlockInstance(RenderObject entity)
{
Matrix4f transformationMatrix = Maths.createTransformationMatrix(entity.getPosition(), entity.getRotX(), entity.getRotY(), entity.getRotZ(), entity.getScale());
Matrix4f transformationMatrix = Maths.createTransformationMatrix(entity.getPosition(), entity.getRotX(),
entity.getRotY(), entity.getRotZ(), entity.getScale());
shader.loadTransformationMatrix(transformationMatrix);
}
@ -52,19 +51,18 @@ public class BlockRenderer extends Renderer implements WorldGenConstants
GL20.glDisableVertexAttribArray(2);
GL30.glBindVertexArray(0);
}
public void enableWireframe() {
if (GingerRegister.getInstance().wireframe)
GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
}
public void disableWireframe() {
if (GingerRegister.getInstance().wireframe)
GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
}
public void prepareRender() {
//TODO: combine VBOS
public void enableWireframe()
{ if (GingerRegister.getInstance().wireframe)
GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE); }
public void disableWireframe()
{ if (GingerRegister.getInstance().wireframe)
GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); }
public void prepareRender()
{
// TODO: combine VBOS
shader.start();
shader.loadSkyColour(Window.getColour());
shader.loadViewMatrix(GingerRegister.getInstance().game.data.camera);
@ -81,18 +79,18 @@ public class BlockRenderer extends Renderer implements WorldGenConstants
for (int x = 0; x < CHUNK_SIZE; x++)
for (int y = 0; y < CHUNK_SIZE; y++)
for (int z = 0; z < CHUNK_SIZE; z++)
{
BlockInstance entity = renderList[Chunk.index(x, y, z)];
if (entity != null && entity.getModel() != null)
{
TexturedModel blockModel = entity.getModel();
GL11.glBindTexture(GL11.GL_TEXTURE_2D, blockModel.getTexture().getTextureID());
prepBlockInstance(entity);
GL11.glDrawElements(GL11.GL_TRIANGLES, blockModel.getRawModel().getVertexCount(), GL11.GL_UNSIGNED_INT, 0);
}
}
{
BlockInstance entity = renderList[Chunk.index(x, y, z)];
if (entity != null && entity.getModel() != null)
{
TexturedModel blockModel = entity.getModel();
GL11.glBindTexture(GL11.GL_TEXTURE_2D, blockModel.getTexture().getTextureID());
prepBlockInstance(entity);
GL11.glDrawElements(GL11.GL_TRIANGLES, blockModel.getRawModel().getVertexCount(),
GL11.GL_UNSIGNED_INT, 0);
}
}
disableWireframe();
shader.stop();
}
}

4
src/main/java/com/github/hydos/ginger/engine/common/api/GingerRegister.java
View File

@ -4,10 +4,10 @@ import java.util.*;
import com.github.hydos.ginger.engine.common.api.game.Game;
import com.github.hydos.ginger.engine.common.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.opengl.font.GUIText;
import com.github.hydos.ginger.engine.common.font.GUIText;
import com.github.hydos.ginger.engine.common.screen.Screen;
import com.github.hydos.ginger.engine.opengl.postprocessing.Fbo;
import com.github.hydos.ginger.engine.opengl.render.MasterRenderer;
import com.github.hydos.ginger.engine.opengl.screen.Screen;
import com.github.hydos.multithreading.GingerThreading;
/** Used if a game wants to access engine variables safely */

2
src/main/java/com/github/hydos/ginger/engine/opengl/fbo/FboCallbackHandler.java → src/main/java/com/github/hydos/ginger/engine/common/fbo/FboCallbackHandler.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.fbo;
package com.github.hydos.ginger.engine.common.fbo;
public abstract class FboCallbackHandler
{

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/Character.java → src/main/java/com/github/hydos/ginger/engine/common/font/Character.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
/** Simple data structure class holding information about a certain glyph in the
* font texture atlas. All sizes are for a font-size of 1. */

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/FontType.java → src/main/java/com/github/hydos/ginger/engine/common/font/FontType.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
/** Represents a font. It holds the font's texture atlas as well as having the
* ability to create the quad vertices for any text using this font. */

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/GUIText.java → src/main/java/com/github/hydos/ginger/engine/common/font/GUIText.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
import org.joml.*;

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/Line.java → src/main/java/com/github/hydos/ginger/engine/common/font/Line.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
import java.util.*;

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/MetaFile.java → src/main/java/com/github/hydos/ginger/engine/common/font/MetaFile.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
import java.io.*;
import java.util.*;

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMaster.java → src/main/java/com/github/hydos/ginger/engine/common/font/TextMaster.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
import java.util.*;

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshCreator.java → src/main/java/com/github/hydos/ginger/engine/common/font/TextMeshCreator.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
import java.util.*;

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshData.java → src/main/java/com/github/hydos/ginger/engine/common/font/TextMeshData.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
/** Stores the vertex data for all the quads on which a text will be rendered. */
public class TextMeshData

2
src/main/java/com/github/hydos/ginger/engine/opengl/font/Word.java → src/main/java/com/github/hydos/ginger/engine/common/font/Word.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.font;
package com.github.hydos.ginger.engine.common.font;
import java.util.*;

2
src/main/java/com/github/hydos/ginger/engine/opengl/screen/Screen.java → src/main/java/com/github/hydos/ginger/engine/common/screen/Screen.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.opengl.screen;
package com.github.hydos.ginger.engine.common.screen;
import java.util.List;

4
src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java
View File

@ -9,12 +9,12 @@ import com.github.hydos.ginger.engine.common.api.GingerRegister;
import com.github.hydos.ginger.engine.common.api.game.*;
import com.github.hydos.ginger.engine.common.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.common.elements.objects.Player;
import com.github.hydos.ginger.engine.common.font.*;
import com.github.hydos.ginger.engine.common.io.Window;
import com.github.hydos.ginger.engine.opengl.font.*;
import com.github.hydos.ginger.engine.common.screen.Screen;
import com.github.hydos.ginger.engine.opengl.postprocessing.*;
import com.github.hydos.ginger.engine.opengl.render.MasterRenderer;
import com.github.hydos.ginger.engine.opengl.render.tools.MousePicker;
import com.github.hydos.ginger.engine.opengl.screen.Screen;
import com.github.hydos.ginger.engine.opengl.utils.GlLoader;
import com.github.hydos.multithreading.GingerThreading;

2
src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerUtils.java
View File

@ -1,8 +1,8 @@
package com.github.hydos.ginger.engine.opengl.api;
import com.github.hydos.ginger.engine.common.font.TextMaster;
import com.github.hydos.ginger.engine.common.obj.ModelLoader;
import com.github.hydos.ginger.engine.common.obj.normals.NormalMappedObjLoader;
import com.github.hydos.ginger.engine.opengl.font.TextMaster;
import com.github.hydos.ginger.engine.opengl.render.MasterRenderer;
import com.github.hydos.ginger.engine.opengl.render.models.*;
import com.github.hydos.ginger.engine.opengl.render.texture.ModelTexture;

2
src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java
View File

@ -2,7 +2,7 @@ package com.github.hydos.ginger.engine.opengl.postprocessing;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.opengl.fbo.FboCallbackHandler;
import com.github.hydos.ginger.engine.common.fbo.FboCallbackHandler;
public class ContrastChanger extends FboCallbackHandler
{

2
src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/Fbo.java
View File

@ -8,8 +8,8 @@ import java.nio.ByteBuffer;
import org.lwjgl.glfw.*;
import org.lwjgl.system.Callback;
import com.github.hydos.ginger.engine.common.fbo.FboCallbackHandler;
import com.github.hydos.ginger.engine.common.io.Window;
import com.github.hydos.ginger.engine.opengl.fbo.FboCallbackHandler;
public class Fbo
{

2
src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/FontRenderer.java
View File

@ -4,7 +4,7 @@ import java.util.*;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.opengl.font.*;
import com.github.hydos.ginger.engine.common.font.*;
import com.github.hydos.ginger.engine.opengl.render.Renderer;
import com.github.hydos.ginger.engine.opengl.render.shaders.FontShader;

2
src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/FontShader.java
View File

@ -2,7 +2,7 @@ package com.github.hydos.ginger.engine.opengl.render.shaders;
import org.joml.*;
import com.github.hydos.ginger.engine.opengl.font.GUIText;
import com.github.hydos.ginger.engine.common.font.GUIText;
public class FontShader extends ShaderProgram
{

6
src/main/java/com/github/hydos/ginger/engine/opengl/voxelutils/BlockMesher.java
View File

@ -1,6 +0,0 @@
package com.github.hydos.ginger.engine.opengl.voxelutils;
public class BlockMesher
{
//TODO: supercoder i ask you that you figure a way to cull inner faces and not just whole blocks :)
}