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

a big refactor for vulkan

pull/12/head
hayden v 2020-03-02 14:19:55 +10:00
parent 202e0f1324
commit efbe206fcd
95 changed files with 278 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,18 +7,18 @@ import com.github.halotroop.litecraft.screens.*;
import com.github.halotroop.litecraft.types.block.Blocks;
import com.github.halotroop.litecraft.util.RelativeDirection;
import com.github.halotroop.litecraft.world.World;
import com.github.hydos.ginger.engine.api.*;
import com.github.hydos.ginger.engine.api.game.*;
import com.github.hydos.ginger.engine.cameras.*;
import com.github.hydos.ginger.engine.elements.objects.*;
import com.github.hydos.ginger.engine.font.FontType;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.obj.ModelLoader;
import com.github.hydos.ginger.engine.obj.shapes.StaticCube;
import com.github.hydos.ginger.engine.render.MasterRenderer;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.main.settings.Constants;
import com.github.hydos.ginger.engine.openGL.Constants;
import com.github.hydos.ginger.engine.openGL.api.*;
import com.github.hydos.ginger.engine.openGL.api.game.*;
import com.github.hydos.ginger.engine.openGL.cameras.*;
import com.github.hydos.ginger.engine.openGL.elements.objects.*;
import com.github.hydos.ginger.engine.openGL.font.FontType;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.obj.ModelLoader;
import com.github.hydos.ginger.engine.openGL.obj.shapes.StaticCube;
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.Loader;
import tk.valoeghese.gateways.client.io.*;

4
src/main/java/com/github/halotroop/litecraft/save/LitecraftSave.java
View File

@ -8,8 +8,8 @@ import org.joml.Vector3f;
import com.github.halotroop.litecraft.Litecraft;
import com.github.halotroop.litecraft.world.*;
import com.github.halotroop.litecraft.world.dimension.Dimension;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.objects.Player;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.elements.objects.Player;
import tk.valoeghese.sod.*;

8
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.api.*;
import com.github.hydos.ginger.engine.font.GUIText;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.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.io.Window;
import com.github.hydos.ginger.engine.openGL.screen.Screen;
public class ExitGameScreen extends Screen
{

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

@ -3,9 +3,9 @@ package com.github.halotroop.litecraft.screens;
import org.joml.*;
import com.github.halotroop.litecraft.Litecraft;
import com.github.hydos.ginger.engine.api.*;
import com.github.hydos.ginger.engine.font.GUIText;
import com.github.hydos.ginger.engine.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
{

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

@ -7,12 +7,12 @@ import org.joml.*;
import com.github.halotroop.litecraft.Litecraft;
import com.github.halotroop.litecraft.save.LitecraftSave;
import com.github.halotroop.litecraft.world.dimension.Dimensions;
import com.github.hydos.ginger.engine.api.Ginger;
import com.github.hydos.ginger.engine.elements.GuiTexture;
import com.github.hydos.ginger.engine.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.font.GUIText;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.screen.Screen;
import com.github.hydos.ginger.engine.openGL.api.Ginger;
import com.github.hydos.ginger.engine.openGL.elements.GuiTexture;
import com.github.hydos.ginger.engine.openGL.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.openGL.font.GUIText;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.screen.Screen;
/**
* YeS

4
src/main/java/com/github/halotroop/litecraft/types/block/Block.java
View File

@ -2,8 +2,8 @@ package com.github.halotroop.litecraft.types.block;
import java.util.*;
import com.github.hydos.ginger.engine.obj.ModelLoader;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.obj.ModelLoader;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
public class Block
{

2
src/main/java/com/github/halotroop/litecraft/types/block/BlockInstance.java
View File

@ -3,7 +3,7 @@ package com.github.halotroop.litecraft.types.block;
import org.joml.Vector3f;
import com.github.halotroop.litecraft.world.Chunk;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.openGL.elements.objects.RenderObject;
public class BlockInstance extends RenderObject
{

4
src/main/java/com/github/halotroop/litecraft/types/entity/Entity.java
View File

@ -2,8 +2,8 @@ package com.github.halotroop.litecraft.types.entity;
import org.joml.Vector3f;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
public abstract class Entity extends RenderObject
{

6
src/main/java/com/github/halotroop/litecraft/world/World.java
View File

@ -15,9 +15,9 @@ import com.github.halotroop.litecraft.world.block.BlockRenderer;
import com.github.halotroop.litecraft.world.dimension.Dimension;
import com.github.halotroop.litecraft.world.gen.*;
import com.github.halotroop.litecraft.world.gen.modifier.WorldModifier;
import com.github.hydos.ginger.engine.elements.objects.Player;
import com.github.hydos.ginger.engine.obj.ModelLoader;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.elements.objects.Player;
import com.github.hydos.ginger.engine.openGL.obj.ModelLoader;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
import it.unimi.dsi.fastutil.longs.*;

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

@ -6,14 +6,14 @@ import org.lwjgl.opengl.*;
import com.github.halotroop.litecraft.types.block.BlockInstance;
import com.github.halotroop.litecraft.world.Chunk;
import com.github.halotroop.litecraft.world.gen.WorldGenConstants;
import com.github.hydos.ginger.engine.api.GingerRegister;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.render.Renderer;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.render.shaders.StaticShader;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.api.GingerRegister;
import com.github.hydos.ginger.engine.openGL.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.math.Maths;
import com.github.hydos.ginger.engine.openGL.render.Renderer;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.render.shaders.StaticShader;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class BlockRenderer extends Renderer implements WorldGenConstants
{

5
src/main/java/com/github/hydos/ginger/engine/obj/Material.java
View File

@ -1,5 +0,0 @@
package com.github.hydos.ginger.engine.obj;
public class Material
{
}

1
src/main/java/com/github/hydos/ginger/engine/obj/shapes/ShapeMesh.java
View File

@ -1 +0,0 @@
package com.github.hydos.ginger.engine.obj.shapes;

2
src/main/java/com/github/hydos/ginger/main/settings/Constants.java → src/main/java/com/github/hydos/ginger/engine/openGL/Constants.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.main.settings;
package com.github.hydos.ginger.engine.openGL;
import org.joml.Vector3f;

24
src/main/java/com/github/hydos/ginger/engine/api/Ginger.java → src/main/java/com/github/hydos/ginger/engine/openGL/api/Ginger.java
View File

@ -1,21 +1,21 @@
package com.github.hydos.ginger.engine.api;
package com.github.hydos.ginger.engine.openGL.api;
import org.joml.Vector2f;
import com.github.halotroop.litecraft.Litecraft;
import com.github.halotroop.litecraft.logic.Timer;
import com.github.halotroop.litecraft.logic.Timer.TickListener;
import com.github.hydos.ginger.engine.api.game.*;
import com.github.hydos.ginger.engine.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.elements.objects.Player;
import com.github.hydos.ginger.engine.font.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.particle.ParticleMaster;
import com.github.hydos.ginger.engine.postprocessing.*;
import com.github.hydos.ginger.engine.render.MasterRenderer;
import com.github.hydos.ginger.engine.render.tools.MousePicker;
import com.github.hydos.ginger.engine.screen.Screen;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.api.game.*;
import com.github.hydos.ginger.engine.openGL.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.openGL.elements.objects.Player;
import com.github.hydos.ginger.engine.openGL.font.*;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.particle.ParticleMaster;
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.Loader;
import com.github.hydos.multithreading.GingerThreading;
public class Ginger

14
src/main/java/com/github/hydos/ginger/engine/api/GingerRegister.java → src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerRegister.java
View File

@ -1,13 +1,13 @@
package com.github.hydos.ginger.engine.api;
package com.github.hydos.ginger.engine.openGL.api;
import java.util.*;
import com.github.hydos.ginger.engine.api.game.Game;
import com.github.hydos.ginger.engine.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.font.GUIText;
import com.github.hydos.ginger.engine.postprocessing.Fbo;
import com.github.hydos.ginger.engine.render.MasterRenderer;
import com.github.hydos.ginger.engine.screen.Screen;
import com.github.hydos.ginger.engine.openGL.api.game.Game;
import com.github.hydos.ginger.engine.openGL.elements.buttons.TextureButton;
import com.github.hydos.ginger.engine.openGL.font.GUIText;
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 */

14
src/main/java/com/github/hydos/ginger/engine/api/GingerUtils.java → src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerUtils.java
View File

@ -1,11 +1,11 @@
package com.github.hydos.ginger.engine.api;
package com.github.hydos.ginger.engine.openGL.api;
import com.github.hydos.ginger.engine.font.TextMaster;
import com.github.hydos.ginger.engine.obj.ModelLoader;
import com.github.hydos.ginger.engine.obj.normals.NormalMappedObjLoader;
import com.github.hydos.ginger.engine.render.MasterRenderer;
import com.github.hydos.ginger.engine.render.models.*;
import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import com.github.hydos.ginger.engine.openGL.font.TextMaster;
import com.github.hydos.ginger.engine.openGL.obj.ModelLoader;
import com.github.hydos.ginger.engine.openGL.obj.normals.NormalMappedObjLoader;
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;
public class GingerUtils
{

2
src/main/java/com/github/hydos/ginger/engine/api/ResourceManager.java → src/main/java/com/github/hydos/ginger/engine/openGL/api/ResourceManager.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.api;
package com.github.hydos.ginger.engine.openGL.api;
/**
* make your own resource manager if you want!

2
src/main/java/com/github/hydos/ginger/engine/api/game/Game.java → src/main/java/com/github/hydos/ginger/engine/openGL/api/game/Game.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.api.game;
package com.github.hydos.ginger.engine.openGL.api.game;
public abstract class Game
{

8
src/main/java/com/github/hydos/ginger/engine/api/game/GameData.java → src/main/java/com/github/hydos/ginger/engine/openGL/api/game/GameData.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.api.game;
package com.github.hydos.ginger.engine.openGL.api.game;
import java.util.*;
import org.joml.Vector4f;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.GuiTexture;
import com.github.hydos.ginger.engine.elements.objects.*;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.elements.GuiTexture;
import com.github.hydos.ginger.engine.openGL.elements.objects.*;
/**
* Used for storing essential engine game data so main class isn't messy

6
src/main/java/com/github/hydos/ginger/engine/cameras/Camera.java → src/main/java/com/github/hydos/ginger/engine/openGL/cameras/Camera.java
View File

@ -1,10 +1,10 @@
package com.github.hydos.ginger.engine.cameras;
package com.github.hydos.ginger.engine.openGL.cameras;
import org.joml.Vector3f;
import org.lwjgl.glfw.*;
import com.github.hydos.ginger.engine.elements.objects.Player;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.openGL.elements.objects.Player;
import com.github.hydos.ginger.engine.openGL.io.Window;
public class Camera
{

6
src/main/java/com/github/hydos/ginger/engine/cameras/FirstPersonCamera.java → src/main/java/com/github/hydos/ginger/engine/openGL/cameras/FirstPersonCamera.java
View File

@ -1,9 +1,9 @@
package com.github.hydos.ginger.engine.cameras;
package com.github.hydos.ginger.engine.openGL.cameras;
import org.joml.Vector3f;
import com.github.hydos.ginger.engine.elements.objects.Player;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.openGL.elements.objects.Player;
import com.github.hydos.ginger.engine.openGL.io.Window;
public class FirstPersonCamera extends Camera
{

2
src/main/java/com/github/hydos/ginger/engine/elements/GuiTexture.java → src/main/java/com/github/hydos/ginger/engine/openGL/elements/GuiTexture.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.elements;
package com.github.hydos.ginger.engine.openGL.elements;
import org.joml.Vector2f;

8
src/main/java/com/github/hydos/ginger/engine/elements/buttons/TextureButton.java → src/main/java/com/github/hydos/ginger/engine/openGL/elements/buttons/TextureButton.java
View File

@ -1,13 +1,13 @@
package com.github.hydos.ginger.engine.elements.buttons;
package com.github.hydos.ginger.engine.openGL.elements.buttons;
import java.util.List;
import org.joml.Vector2f;
import org.lwjgl.glfw.GLFW;
import com.github.hydos.ginger.engine.elements.GuiTexture;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.elements.GuiTexture;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class TextureButton
{

2
src/main/java/com/github/hydos/ginger/engine/elements/objects/Light.java → src/main/java/com/github/hydos/ginger/engine/openGL/elements/objects/Light.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.elements.objects;
package com.github.hydos.ginger.engine.openGL.elements.objects;
import org.joml.Vector3f;

10
src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java → src/main/java/com/github/hydos/ginger/engine/openGL/elements/objects/Player.java
View File

@ -1,14 +1,14 @@
package com.github.hydos.ginger.engine.elements.objects;
package com.github.hydos.ginger.engine.openGL.elements.objects;
import org.joml.Vector3f;
import com.github.halotroop.litecraft.Litecraft;
import com.github.halotroop.litecraft.util.RelativeDirection;
import com.github.halotroop.litecraft.world.gen.WorldGenConstants;
import com.github.hydos.ginger.engine.api.GingerRegister;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.main.settings.Constants;
import com.github.hydos.ginger.engine.openGL.Constants;
import com.github.hydos.ginger.engine.openGL.api.GingerRegister;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
public class Player extends RenderObject implements WorldGenConstants
{

4
src/main/java/com/github/hydos/ginger/engine/elements/objects/RenderObject.java → src/main/java/com/github/hydos/ginger/engine/openGL/elements/objects/RenderObject.java
View File

@ -1,8 +1,8 @@
package com.github.hydos.ginger.engine.elements.objects;
package com.github.hydos.ginger.engine.openGL.elements.objects;
import org.joml.Vector3f;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
public class RenderObject
{

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

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

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

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.font;
package com.github.hydos.ginger.engine.openGL.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/font/FontType.java → src/main/java/com/github/hydos/ginger/engine/openGL/font/FontType.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.font;
package com.github.hydos.ginger.engine.openGL.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/font/GUIText.java → src/main/java/com/github/hydos/ginger/engine/openGL/font/GUIText.java
View File

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

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

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

4
src/main/java/com/github/hydos/ginger/engine/font/MetaFile.java → src/main/java/com/github/hydos/ginger/engine/openGL/font/MetaFile.java
View File

@ -1,9 +1,9 @@
package com.github.hydos.ginger.engine.font;
package com.github.hydos.ginger.engine.openGL.font;
import java.io.*;
import java.util.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.openGL.io.Window;
/** Provides functionality for getting the values from a font file. */
public class MetaFile

8
src/main/java/com/github/hydos/ginger/engine/font/TextMaster.java → src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMaster.java
View File

@ -1,10 +1,10 @@
package com.github.hydos.ginger.engine.font;
package com.github.hydos.ginger.engine.openGL.font;
import java.util.*;
import com.github.hydos.ginger.engine.api.Ginger;
import com.github.hydos.ginger.engine.render.renderers.FontRenderer;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.api.Ginger;
import com.github.hydos.ginger.engine.openGL.render.renderers.FontRenderer;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class TextMaster
{

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

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

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

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.font;
package com.github.hydos.ginger.engine.openGL.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/font/Word.java → src/main/java/com/github/hydos/ginger/engine/openGL/font/Word.java
View File

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

6
src/main/java/com/github/hydos/ginger/engine/io/Window.java → src/main/java/com/github/hydos/ginger/engine/openGL/io/Window.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.io;
package com.github.hydos.ginger.engine.openGL.io;
import java.nio.*;
@ -7,8 +7,8 @@ import org.lwjgl.BufferUtils;
import org.lwjgl.glfw.*;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.api.Ginger;
import com.github.hydos.ginger.engine.render.texture.Image;
import com.github.hydos.ginger.engine.openGL.api.Ginger;
import com.github.hydos.ginger.engine.openGL.render.texture.Image;
public class Window
{

4
src/main/java/com/github/hydos/ginger/engine/math/Maths.java → src/main/java/com/github/hydos/ginger/engine/openGL/math/Maths.java
View File

@ -1,10 +1,10 @@
package com.github.hydos.ginger.engine.math;
package com.github.hydos.ginger.engine.openGL.math;
import java.lang.Math;
import org.joml.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
public class Maths
{

5
src/main/java/com/github/hydos/ginger/engine/openGL/obj/Material.java Normal file
View File

@ -0,0 +1,5 @@
package com.github.hydos.ginger.engine.openGL.obj;
public class Material
{
}

2
src/main/java/com/github/hydos/ginger/engine/obj/Mesh.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/Mesh.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.obj;
package com.github.hydos.ginger.engine.openGL.obj;
public class Mesh
{

10
src/main/java/com/github/hydos/ginger/engine/obj/ModelLoader.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/ModelLoader.java
View File

@ -1,9 +1,9 @@
package com.github.hydos.ginger.engine.obj;
package com.github.hydos.ginger.engine.openGL.obj;
import com.github.hydos.ginger.engine.obj.shapes.StaticCube;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.obj.shapes.StaticCube;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class ModelLoader
{

2
src/main/java/com/github/hydos/ginger/engine/obj/OBJFileLoader.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/OBJFileLoader.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.obj;
package com.github.hydos.ginger.engine.openGL.obj;
import org.joml.*;
import org.lwjgl.assimp.*;

2
src/main/java/com/github/hydos/ginger/engine/obj/Vertex.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/Vertex.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.obj;
package com.github.hydos.ginger.engine.openGL.obj;
import org.joml.*;

2
src/main/java/com/github/hydos/ginger/engine/obj/normals/ModelDataNM.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/normals/ModelDataNM.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.obj.normals;
package com.github.hydos.ginger.engine.openGL.obj.normals;
public class ModelDataNM
{

6
src/main/java/com/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/normals/NormalMappedObjLoader.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.obj.normals;
package com.github.hydos.ginger.engine.openGL.obj.normals;
import java.io.*;
import java.util.*;
import org.joml.*;
import com.github.hydos.ginger.engine.render.models.RawModel;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.render.models.RawModel;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class NormalMappedObjLoader
{

2
src/main/java/com/github/hydos/ginger/engine/obj/normals/VertexNM.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/normals/VertexNM.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.obj.normals;
package com.github.hydos.ginger.engine.openGL.obj.normals;
import java.util.*;

1
src/main/java/com/github/hydos/ginger/engine/openGL/obj/shapes/ShapeMesh.java Normal file
View File

@ -0,0 +1 @@
package com.github.hydos.ginger.engine.openGL.obj.shapes;

4
src/main/java/com/github/hydos/ginger/engine/obj/shapes/StaticCube.java → src/main/java/com/github/hydos/ginger/engine/openGL/obj/shapes/StaticCube.java
View File

@ -1,6 +1,6 @@
package com.github.hydos.ginger.engine.obj.shapes;
package com.github.hydos.ginger.engine.openGL.obj.shapes;
import com.github.hydos.ginger.engine.obj.Mesh;
import com.github.hydos.ginger.engine.openGL.obj.Mesh;
public class StaticCube
{

2
src/main/java/com/github/hydos/ginger/engine/particle/InsertionSort.java → src/main/java/com/github/hydos/ginger/engine/openGL/particle/InsertionSort.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.particle;
package com.github.hydos.ginger.engine.openGL.particle;
import java.util.List;

8
src/main/java/com/github/hydos/ginger/engine/particle/Particle.java → src/main/java/com/github/hydos/ginger/engine/openGL/particle/Particle.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.particle;
package com.github.hydos.ginger.engine.openGL.particle;
import java.lang.Math;
import org.joml.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.main.settings.Constants;
import com.github.hydos.ginger.engine.openGL.Constants;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.io.Window;
public class Particle
{

6
src/main/java/com/github/hydos/ginger/engine/particle/ParticleMaster.java → src/main/java/com/github/hydos/ginger/engine/openGL/particle/ParticleMaster.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.particle;
package com.github.hydos.ginger.engine.openGL.particle;
import java.util.*;
import java.util.Map.Entry;
import org.joml.Matrix4f;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.render.renderers.ParticleRenderer;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.render.renderers.ParticleRenderer;
public class ParticleMaster
{

4
src/main/java/com/github/hydos/ginger/engine/particle/ParticleSystem.java → src/main/java/com/github/hydos/ginger/engine/openGL/particle/ParticleSystem.java
View File

@ -1,11 +1,11 @@
package com.github.hydos.ginger.engine.particle;
package com.github.hydos.ginger.engine.openGL.particle;
import java.lang.Math;
import java.util.Random;
import org.joml.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.openGL.io.Window;
public class ParticleSystem
{

2
src/main/java/com/github/hydos/ginger/engine/particle/ParticleTexture.java → src/main/java/com/github/hydos/ginger/engine/openGL/particle/ParticleTexture.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.particle;
package com.github.hydos.ginger.engine.openGL.particle;
public class ParticleTexture
{

4
src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java → src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastChanger.java
View File

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

4
src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastShader.java
View File

@ -1,6 +1,6 @@
package com.github.hydos.ginger.engine.postprocessing;
package com.github.hydos.ginger.engine.openGL.postprocessing;
import com.github.hydos.ginger.engine.render.shaders.ShaderProgram;
import com.github.hydos.ginger.engine.openGL.render.shaders.ShaderProgram;
public class ContrastShader extends ShaderProgram
{

6
src/main/java/com/github/hydos/ginger/engine/postprocessing/Fbo.java → src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/Fbo.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.postprocessing;
package com.github.hydos.ginger.engine.openGL.postprocessing;
import static org.lwjgl.opengl.ARBFramebufferObject.*;
import static org.lwjgl.opengl.GL11.*;
@ -8,8 +8,8 @@ import java.nio.ByteBuffer;
import org.lwjgl.glfw.*;
import org.lwjgl.system.Callback;
import com.github.hydos.ginger.engine.fbo.FboCallbackHandler;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.openGL.fbo.FboCallbackHandler;
import com.github.hydos.ginger.engine.openGL.io.Window;
public class Fbo
{

2
src/main/java/com/github/hydos/ginger/engine/postprocessing/ImageRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ImageRenderer.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.postprocessing;
package com.github.hydos.ginger.engine.openGL.postprocessing;
import org.lwjgl.opengl.GL11;

6
src/main/java/com/github/hydos/ginger/engine/postprocessing/PostProcessing.java → src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/PostProcessing.java
View File

@ -1,9 +1,9 @@
package com.github.hydos.ginger.engine.postprocessing;
package com.github.hydos.ginger.engine.openGL.postprocessing;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.render.models.RawModel;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.render.models.RawModel;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class PostProcessing
{

18
src/main/java/com/github/hydos/ginger/engine/render/MasterRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/MasterRenderer.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render;
package com.github.hydos.ginger.engine.openGL.render;
import java.lang.Math;
import java.util.*;
@ -8,14 +8,14 @@ import org.lwjgl.opengl.*;
import com.github.halotroop.litecraft.world.World;
import com.github.halotroop.litecraft.world.block.BlockRenderer;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.GuiTexture;
import com.github.hydos.ginger.engine.elements.objects.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.render.renderers.*;
import com.github.hydos.ginger.engine.render.shaders.*;
import com.github.hydos.ginger.engine.shadow.ShadowMapMasterRenderer;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.elements.GuiTexture;
import com.github.hydos.ginger.engine.openGL.elements.objects.*;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.render.renderers.*;
import com.github.hydos.ginger.engine.openGL.render.shaders.*;
import com.github.hydos.ginger.engine.openGL.shadow.ShadowMapMasterRenderer;
public class MasterRenderer
{

5
src/main/java/com/github/hydos/ginger/engine/openGL/render/Renderer.java Normal file
View File

@ -0,0 +1,5 @@
package com.github.hydos.ginger.engine.openGL.render;
public abstract class Renderer
{
}

2
src/main/java/com/github/hydos/ginger/engine/render/models/RawModel.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/models/RawModel.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.models;
package com.github.hydos.ginger.engine.openGL.render.models;
public class RawModel
{

4
src/main/java/com/github/hydos/ginger/engine/render/models/TexturedModel.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/models/TexturedModel.java
View File

@ -1,6 +1,6 @@
package com.github.hydos.ginger.engine.render.models;
package com.github.hydos.ginger.engine.openGL.render.models;
import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture;
public class TexturedModel
{

8
src/main/java/com/github/hydos/ginger/engine/render/renderers/FontRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/FontRenderer.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.render.renderers;
package com.github.hydos.ginger.engine.openGL.render.renderers;
import java.util.*;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.font.*;
import com.github.hydos.ginger.engine.render.Renderer;
import com.github.hydos.ginger.engine.render.shaders.FontShader;
import com.github.hydos.ginger.engine.openGL.font.*;
import com.github.hydos.ginger.engine.openGL.render.Renderer;
import com.github.hydos.ginger.engine.openGL.render.shaders.FontShader;
public class FontRenderer extends Renderer
{

14
src/main/java/com/github/hydos/ginger/engine/render/renderers/GuiRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/GuiRenderer.java
View File

@ -1,16 +1,16 @@
package com.github.hydos.ginger.engine.render.renderers;
package com.github.hydos.ginger.engine.openGL.render.renderers;
import java.util.List;
import org.joml.Matrix4f;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.elements.GuiTexture;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.render.Renderer;
import com.github.hydos.ginger.engine.render.models.RawModel;
import com.github.hydos.ginger.engine.render.shaders.GuiShader;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.elements.GuiTexture;
import com.github.hydos.ginger.engine.openGL.math.Maths;
import com.github.hydos.ginger.engine.openGL.render.Renderer;
import com.github.hydos.ginger.engine.openGL.render.models.RawModel;
import com.github.hydos.ginger.engine.openGL.render.shaders.GuiShader;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class GuiRenderer extends Renderer
{

18
src/main/java/com/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/NormalMappingRenderer.java
View File

@ -1,18 +1,18 @@
package com.github.hydos.ginger.engine.render.renderers;
package com.github.hydos.ginger.engine.openGL.render.renderers;
import java.util.*;
import org.joml.*;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.objects.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.render.*;
import com.github.hydos.ginger.engine.render.models.*;
import com.github.hydos.ginger.engine.render.shaders.NormalMappingShader;
import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.elements.objects.*;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.math.Maths;
import com.github.hydos.ginger.engine.openGL.render.*;
import com.github.hydos.ginger.engine.openGL.render.models.*;
import com.github.hydos.ginger.engine.openGL.render.shaders.NormalMappingShader;
import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture;
public class NormalMappingRenderer extends Renderer
{

18
src/main/java/com/github/hydos/ginger/engine/render/renderers/ObjectRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/ObjectRenderer.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.renderers;
package com.github.hydos.ginger.engine.openGL.render.renderers;
import java.util.*;
@ -6,14 +6,14 @@ import org.joml.Matrix4f;
import org.lwjgl.opengl.*;
import com.github.halotroop.litecraft.types.block.BlockInstance;
import com.github.hydos.ginger.engine.api.GingerRegister;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.render.*;
import com.github.hydos.ginger.engine.render.models.*;
import com.github.hydos.ginger.engine.render.shaders.StaticShader;
import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import com.github.hydos.ginger.engine.openGL.api.GingerRegister;
import com.github.hydos.ginger.engine.openGL.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.math.Maths;
import com.github.hydos.ginger.engine.openGL.render.*;
import com.github.hydos.ginger.engine.openGL.render.models.*;
import com.github.hydos.ginger.engine.openGL.render.shaders.StaticShader;
import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture;
public class ObjectRenderer extends Renderer
{

16
src/main/java/com/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/ParticleRenderer.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.renderers;
package com.github.hydos.ginger.engine.openGL.render.renderers;
import java.lang.Math;
import java.nio.FloatBuffer;
@ -8,13 +8,13 @@ import org.joml.*;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.particle.*;
import com.github.hydos.ginger.engine.render.Renderer;
import com.github.hydos.ginger.engine.render.models.RawModel;
import com.github.hydos.ginger.engine.render.shaders.ParticleShader;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.math.Maths;
import com.github.hydos.ginger.engine.openGL.particle.*;
import com.github.hydos.ginger.engine.openGL.render.Renderer;
import com.github.hydos.ginger.engine.openGL.render.models.RawModel;
import com.github.hydos.ginger.engine.openGL.render.shaders.ParticleShader;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class ParticleRenderer extends Renderer
{

12
src/main/java/com/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/SkyboxRenderer.java
View File

@ -1,13 +1,13 @@
package com.github.hydos.ginger.engine.render.renderers;
package com.github.hydos.ginger.engine.openGL.render.renderers;
import org.joml.Matrix4f;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.render.Renderer;
import com.github.hydos.ginger.engine.render.models.RawModel;
import com.github.hydos.ginger.engine.render.shaders.SkyboxShader;
import com.github.hydos.ginger.engine.utils.Loader;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.render.Renderer;
import com.github.hydos.ginger.engine.openGL.render.models.RawModel;
import com.github.hydos.ginger.engine.openGL.render.shaders.SkyboxShader;
import com.github.hydos.ginger.engine.openGL.utils.Loader;
public class SkyboxRenderer extends Renderer
{

4
src/main/java/com/github/hydos/ginger/engine/render/shaders/FontShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/FontShader.java
View File

@ -1,8 +1,8 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import org.joml.*;
import com.github.hydos.ginger.engine.font.GUIText;
import com.github.hydos.ginger.engine.openGL.font.GUIText;
public class FontShader extends ShaderProgram
{

2
src/main/java/com/github/hydos/ginger/engine/render/shaders/GuiShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/GuiShader.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import org.joml.Matrix4f;

4
src/main/java/com/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/NormalMappingShader.java
View File

@ -1,10 +1,10 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import java.util.List;
import org.joml.*;
import com.github.hydos.ginger.engine.elements.objects.Light;
import com.github.hydos.ginger.engine.openGL.elements.objects.Light;
public class NormalMappingShader extends ShaderProgram
{

2
src/main/java/com/github/hydos/ginger/engine/render/shaders/ParticleShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ParticleShader.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import org.joml.Matrix4f;

2
src/main/java/com/github/hydos/ginger/engine/render/shaders/ShaderProgram.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ShaderProgram.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import java.io.*;

6
src/main/java/com/github/hydos/ginger/engine/render/shaders/SkyboxShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/SkyboxShader.java
View File

@ -1,9 +1,9 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import org.joml.Matrix4f;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.math.Maths;
public class SkyboxShader extends ShaderProgram
{

8
src/main/java/com/github/hydos/ginger/engine/render/shaders/StaticShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/StaticShader.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import java.util.List;
import org.joml.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.objects.Light;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.elements.objects.Light;
import com.github.hydos.ginger.engine.openGL.math.Maths;
public class StaticShader extends ShaderProgram
{

8
src/main/java/com/github/hydos/ginger/engine/render/shaders/TerrainShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/TerrainShader.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.render.shaders;
package com.github.hydos.ginger.engine.openGL.render.shaders;
import java.util.List;
import org.joml.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.objects.Light;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.elements.objects.Light;
import com.github.hydos.ginger.engine.openGL.math.Maths;
public class TerrainShader extends ShaderProgram
{

6
src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ColorDepth.java Normal file
View File

@ -0,0 +1,6 @@
package com.github.hydos.ginger.engine.openGL.render.texture;
public enum ColorDepth
{
R, RG, RGB, RGBA
}

4
src/main/java/com/github/hydos/ginger/engine/render/texture/Image.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/Image.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.texture;
package com.github.hydos.ginger.engine.openGL.render.texture;
import static org.lwjgl.stb.STBImage.*;
import static org.lwjgl.system.MemoryStack.stackPush;
@ -8,7 +8,7 @@ import java.nio.*;
import org.lwjgl.system.MemoryStack;
import com.github.hydos.ginger.engine.render.tools.IOUtil;
import com.github.hydos.ginger.engine.openGL.render.tools.IOUtil;
public class Image
{

2
src/main/java/com/github/hydos/ginger/engine/render/texture/ModelTexture.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ModelTexture.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.texture;
package com.github.hydos.ginger.engine.openGL.render.texture;
import org.lwjgl.opengl.*;

2
src/main/java/com/github/hydos/ginger/engine/render/tools/IOUtil.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/IOUtil.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.render.tools;
package com.github.hydos.ginger.engine.openGL.render.tools;
import static org.lwjgl.BufferUtils.createByteBuffer;

8
src/main/java/com/github/hydos/ginger/engine/render/tools/MousePicker.java → src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/MousePicker.java
View File

@ -1,10 +1,10 @@
package com.github.hydos.ginger.engine.render.tools;
package com.github.hydos.ginger.engine.openGL.render.tools;
import org.joml.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.math.Maths;
public class MousePicker
{

4
src/main/java/com/github/hydos/ginger/engine/screen/Screen.java → src/main/java/com/github/hydos/ginger/engine/openGL/screen/Screen.java
View File

@ -1,8 +1,8 @@
package com.github.hydos.ginger.engine.screen;
package com.github.hydos.ginger.engine.openGL.screen;
import java.util.List;
import com.github.hydos.ginger.engine.elements.GuiTexture;
import com.github.hydos.ginger.engine.openGL.elements.GuiTexture;
public abstract class Screen
{

8
src/main/java/com/github/hydos/ginger/engine/shadow/ShadowBox.java → src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowBox.java
View File

@ -1,12 +1,12 @@
package com.github.hydos.ginger.engine.shadow;
package com.github.hydos.ginger.engine.openGL.shadow;
import java.lang.Math;
import org.joml.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.render.MasterRenderer;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.render.MasterRenderer;
/** Represents the 3D cuboidal area of the world in which objects will cast
* shadows (basically represents the orthographic projection area for the shadow

4
src/main/java/com/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java → src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowFrameBuffer.java
View File

@ -1,10 +1,10 @@
package com.github.hydos.ginger.engine.shadow;
package com.github.hydos.ginger.engine.openGL.shadow;
import java.nio.ByteBuffer;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.openGL.io.Window;
/** The frame buffer for the shadow pass. This class sets up the depth texture
* which can be rendered to during the shadow render pass, producing a shadow

10
src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapEntityRenderer.java
View File

@ -1,14 +1,14 @@
package com.github.hydos.ginger.engine.shadow;
package com.github.hydos.ginger.engine.openGL.shadow;
import java.util.*;
import org.joml.Matrix4f;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.render.MasterRenderer;
import com.github.hydos.ginger.engine.render.models.*;
import com.github.hydos.ginger.engine.openGL.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.openGL.math.Maths;
import com.github.hydos.ginger.engine.openGL.render.MasterRenderer;
import com.github.hydos.ginger.engine.openGL.render.models.*;
public class ShadowMapEntityRenderer
{

8
src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java → src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapMasterRenderer.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.shadow;
package com.github.hydos.ginger.engine.openGL.shadow;
import java.lang.Math;
import java.util.*;
@ -6,9 +6,9 @@ import java.util.*;
import org.joml.*;
import org.lwjgl.opengl.GL11;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.objects.*;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.openGL.cameras.Camera;
import com.github.hydos.ginger.engine.openGL.elements.objects.*;
import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel;
/** This class is in charge of using all of the classes in the shadows package to
* carry out the shadow render pass, i.e. rendering the scene to the shadow map

4
src/main/java/com/github/hydos/ginger/engine/shadow/ShadowShader.java → src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowShader.java
View File

@ -1,8 +1,8 @@
package com.github.hydos.ginger.engine.shadow;
package com.github.hydos.ginger.engine.openGL.shadow;
import org.joml.Matrix4f;
import com.github.hydos.ginger.engine.render.shaders.ShaderProgram;
import com.github.hydos.ginger.engine.openGL.render.shaders.ShaderProgram;
public class ShadowShader extends ShaderProgram
{

2
src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexture.java → src/main/java/com/github/hydos/ginger/engine/openGL/terrain/TerrainTexture.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.terrain;
package com.github.hydos.ginger.engine.openGL.terrain;
public class TerrainTexture
{

2
src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexturePack.java → src/main/java/com/github/hydos/ginger/engine/openGL/terrain/TerrainTexturePack.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.terrain;
package com.github.hydos.ginger.engine.openGL.terrain;
public class TerrainTexturePack
{

11
src/main/java/com/github/hydos/ginger/engine/utils/Loader.java → src/main/java/com/github/hydos/ginger/engine/openGL/utils/Loader.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.engine.utils;
package com.github.hydos.ginger.engine.openGL.utils;
import java.nio.*;
import java.util.*;
@ -7,10 +7,10 @@ import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.*;
import com.github.halotroop.litecraft.types.block.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.render.models.RawModel;
import com.github.hydos.ginger.engine.render.texture.*;
import com.github.hydos.ginger.engine.terrain.TerrainTexture;
import com.github.hydos.ginger.engine.openGL.io.Window;
import com.github.hydos.ginger.engine.openGL.render.models.RawModel;
import com.github.hydos.ginger.engine.openGL.render.texture.*;
import com.github.hydos.ginger.engine.openGL.terrain.TerrainTexture;
public class Loader
{
@ -127,6 +127,7 @@ public class Loader
//just in case
if(!block.texture.equals("DONTLOAD")) {
System.out.println(block.texture);
block.updateBlockModelData();
if(currentX > maxX) {
currentX = 0;

2
src/main/java/com/github/hydos/ginger/voxelutils/BlockMesher.java → src/main/java/com/github/hydos/ginger/engine/openGL/voxelutils/BlockMesher.java
View File

@ -1,4 +1,4 @@
package com.github.hydos.ginger.voxelutils;
package com.github.hydos.ginger.engine.openGL.voxelutils;
public class BlockMesher
{

5
src/main/java/com/github/hydos/ginger/engine/render/Renderer.java
View File

@ -1,5 +0,0 @@
package com.github.hydos.ginger.engine.render;
public abstract class Renderer
{
}

6
src/main/java/com/github/hydos/ginger/engine/render/texture/ColorDepth.java
View File

@ -1,6 +0,0 @@
package com.github.hydos.ginger.engine.render.texture;
public enum ColorDepth
{
R, RG, RGB, RGBA
}

6
src/main/java/com/github/hydos/ginger/main/tools/GSceneBuilder.java
View File

@ -1,6 +0,0 @@
package com.github.hydos.ginger.main.tools;
public class GSceneBuilder
{
/** The class for turning GScene files into the engine parts in java */
}

2
src/main/java/com/github/hydos/multithreading/GingerThreading.java
View File

@ -3,7 +3,7 @@ package com.github.hydos.multithreading;
import java.util.*;
import com.github.halotroop.litecraft.Litecraft;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.openGL.io.Window;
public class GingerThreading extends Thread
{