Refactor and Optimisation (dynamic text)

pull/4/head
hYdos 2020-02-24 07:53:01 +10:00 committed by halotroop2288
parent ef7bcbc04c
commit c2a162a3ec
105 changed files with 479 additions and 349 deletions

View File

@ -1,25 +1,25 @@
package io.github.hydos.ginger; package com.github.hydos.ginger;
import java.util.*; import java.util.*;
import io.github.hydos.ginger.engine.api.*; import com.github.hydos.ginger.engine.api.*;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.elements.GuiTexture; import com.github.hydos.ginger.engine.elements.GuiTexture;
import io.github.hydos.ginger.engine.elements.buttons.TextureButton; import com.github.hydos.ginger.engine.elements.buttons.TextureButton;
import io.github.hydos.ginger.engine.elements.objects.*; import com.github.hydos.ginger.engine.elements.objects.*;
import io.github.hydos.ginger.engine.font.*; import com.github.hydos.ginger.engine.font.*;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.vectors.*; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.obj.ModelLoader; import com.github.hydos.ginger.engine.obj.ModelLoader;
import io.github.hydos.ginger.engine.obj.shapes.StaticCube; import com.github.hydos.ginger.engine.obj.shapes.StaticCube;
import io.github.hydos.ginger.engine.particle.*; import com.github.hydos.ginger.engine.particle.*;
import io.github.hydos.ginger.engine.render.MasterRenderer; import com.github.hydos.ginger.engine.render.MasterRenderer;
import io.github.hydos.ginger.engine.render.models.TexturedModel; import com.github.hydos.ginger.engine.render.models.TexturedModel;
import io.github.hydos.ginger.engine.terrain.*; import com.github.hydos.ginger.engine.terrain.*;
import io.github.hydos.ginger.engine.utils.Loader; import com.github.hydos.ginger.engine.utils.Loader;
import io.github.hydos.ginger.main.GingerMain; import com.github.hydos.ginger.main.GingerMain;
import io.github.hydos.ginger.main.settings.Constants; import com.github.hydos.ginger.main.settings.Constants;
import io.github.hydos.litecraft.Block; import com.github.hydos.litecraft.Block;
public class Example extends Game{ public class Example extends Game{
@ -122,8 +122,8 @@ public class Example extends Game{
if(isInWorld) { if(isInWorld) {
ginger3D.renderWithoutTerrain(this); ginger3D.renderWithoutTerrain(this);
// TODO: dynamic text // TODO: dynamic text
// text.textString = "" + (data.entities.size() + data.flatTerrains.size());
} }
text.setText(playButton.isClicked() + "");
ginger3D.renderOverlays(this); ginger3D.renderOverlays(this);
playButton.update(); playButton.update();

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger; package com.github.hydos.ginger;
public class Starter { public class Starter {

View File

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

View File

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

View File

@ -1,13 +1,13 @@
package io.github.hydos.ginger.engine.api; package com.github.hydos.ginger.engine.api;
import io.github.hydos.ginger.engine.font.TextMaster; import com.github.hydos.ginger.engine.font.TextMaster;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.particle.ParticleMaster; import com.github.hydos.ginger.engine.particle.ParticleMaster;
import io.github.hydos.ginger.engine.postprocessing.*; import com.github.hydos.ginger.engine.postprocessing.*;
import io.github.hydos.ginger.engine.render.MasterRenderer; import com.github.hydos.ginger.engine.render.MasterRenderer;
import io.github.hydos.ginger.engine.render.tools.MousePicker; import com.github.hydos.ginger.engine.render.tools.MousePicker;
import io.github.hydos.ginger.engine.utils.Loader; import com.github.hydos.ginger.engine.utils.Loader;
import io.github.hydos.ginger.main.GingerMain; import com.github.hydos.ginger.main.GingerMain;
public class Ginger { public class Ginger {

View File

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

View File

@ -1,11 +1,11 @@
package io.github.hydos.ginger.engine.cameras; package com.github.hydos.ginger.engine.cameras;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWScrollCallback; import org.lwjgl.glfw.GLFWScrollCallback;
import io.github.hydos.ginger.engine.elements.objects.Player; import com.github.hydos.ginger.engine.elements.objects.Player;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class Camera { public class Camera {

View File

@ -1,9 +1,9 @@
package io.github.hydos.ginger.engine.cameras; package com.github.hydos.ginger.engine.cameras;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class FirstPersonCamera { public class FirstPersonCamera {

View File

@ -1,6 +1,6 @@
package io.github.hydos.ginger.engine.elements; package com.github.hydos.ginger.engine.elements;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.Vector2f;
public class GuiTexture { public class GuiTexture {

View File

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

View File

@ -1,6 +1,6 @@
package io.github.hydos.ginger.engine.elements.objects; package com.github.hydos.ginger.engine.elements.objects;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class Light { public class Light {

View File

@ -1,12 +1,12 @@
package io.github.hydos.ginger.engine.elements.objects; package com.github.hydos.ginger.engine.elements.objects;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
import io.github.hydos.ginger.engine.render.models.TexturedModel; import com.github.hydos.ginger.engine.render.models.TexturedModel;
import io.github.hydos.ginger.engine.terrain.Terrain; import com.github.hydos.ginger.engine.terrain.Terrain;
import io.github.hydos.ginger.main.settings.Constants; import com.github.hydos.ginger.main.settings.Constants;
public class Player extends RenderObject{ public class Player extends RenderObject{

View File

@ -1,7 +1,7 @@
package io.github.hydos.ginger.engine.elements.objects; package com.github.hydos.ginger.engine.elements.objects;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
import io.github.hydos.ginger.engine.render.models.TexturedModel; import com.github.hydos.ginger.engine.render.models.TexturedModel;
public class RenderObject { public class RenderObject {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
/** /**
* Simple data structure class holding information about a certain glyph in the * Simple data structure class holding information about a certain glyph in the

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
/** /**
* Represents a font. It holds the font's texture atlas as well as having the * Represents a font. It holds the font's texture atlas as well as having the

View File

@ -1,7 +1,6 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
/** /**
* Represents a piece of text in the game. * Represents a piece of text in the game.
@ -255,5 +254,12 @@ public class GUIText {
this.outlineColour = outlineColour; this.outlineColour = outlineColour;
} }
public void setText(String string) {
this.remove();
this.textString = string;
TextMaster.loadText(this);
}
} }

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -6,7 +6,7 @@ import java.io.InputStreamReader;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
/** /**
* Provides functionality for getting the values from a font file. * Provides functionality for getting the values from a font file.

View File

@ -1,12 +1,12 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import io.github.hydos.ginger.engine.render.renderers.FontRenderer; import com.github.hydos.ginger.engine.render.renderers.FontRenderer;
import io.github.hydos.ginger.engine.utils.Loader; import com.github.hydos.ginger.engine.utils.Loader;
public class TextMaster { public class TextMaster {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

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

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.font; package com.github.hydos.ginger.engine.font;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.io; package com.github.hydos.ginger.engine.io;
import java.nio.DoubleBuffer; import java.nio.DoubleBuffer;
@ -12,9 +12,8 @@ import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GLCapabilities; import org.lwjgl.opengl.GLCapabilities;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.render.texture.Image;
import io.github.hydos.ginger.engine.render.texture.Image;
public class Window { public class Window {

View File

@ -1,9 +1,8 @@
package io.github.hydos.ginger.engine.math; package com.github.hydos.ginger.engine.math;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
public class Maths { public class Maths {

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math; package com.github.hydos.ginger.engine.math;
/** /**
* *
@ -44,10 +44,8 @@ import java.nio.FloatBuffer;
import org.joml.Vector4f; import org.joml.Vector4f;
import io.github.hydos.ginger.engine.math.matrixes.Matrix3f; import com.github.hydos.ginger.engine.math.matrixes.*;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.ReadableVector4f;
import io.github.hydos.ginger.engine.math.vectors.Vector;
public class Quaternion extends Vector implements ReadableVector4f { public class Quaternion extends Vector implements ReadableVector4f {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.matrixes; package com.github.hydos.ginger.engine.math.matrixes;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -29,12 +29,12 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.matrixes; package com.github.hydos.ginger.engine.math.matrixes;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.Vector2f;
/** /**
* *

View File

@ -31,12 +31,12 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.matrixes; package com.github.hydos.ginger.engine.math.matrixes;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
/** /**
* *

View File

@ -29,15 +29,14 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.matrixes; package com.github.hydos.ginger.engine.math.matrixes;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import org.joml.Vector4f; import org.joml.Vector4f;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
/** /**
* Holds a 4x4 float matrix. * Holds a 4x4 float matrix.

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
/** /**
* @author foo * @author foo

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
/** /**
* @author foo * @author foo

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
/** /**
* @author foo * @author foo

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
import java.io.Serializable; import java.io.Serializable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
/** /**
* Writable interface to Vector2fs * Writable interface to Vector2fs

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
/** /**
* Writable interface to Vector3fs * Writable interface to Vector3fs

View File

@ -29,7 +29,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package io.github.hydos.ginger.engine.math.vectors; package com.github.hydos.ginger.engine.math.vectors;
/** /**
* Writable interface to Vector4fs * Writable interface to Vector4fs

View File

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

View File

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

View File

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

View File

@ -1,14 +1,14 @@
package io.github.hydos.ginger.engine.obj; package com.github.hydos.ginger.engine.obj;
import org.lwjgl.assimp.AIFace; import org.lwjgl.assimp.AIFace;
import org.lwjgl.assimp.AIMesh; import org.lwjgl.assimp.AIMesh;
import org.lwjgl.assimp.AIScene; import org.lwjgl.assimp.AIScene;
import org.lwjgl.assimp.AIVector3D; import org.lwjgl.assimp.AIVector3D;
import org.lwjgl.assimp.AIVector3D.Buffer; import org.lwjgl.assimp.AIVector3D.Buffer;
import org.lwjgl.assimp.Assimp;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
import org.lwjgl.assimp.Assimp;
public class OBJFileLoader { public class OBJFileLoader {

View File

@ -1,7 +1,6 @@
package io.github.hydos.ginger.engine.obj; package com.github.hydos.ginger.engine.obj;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
public class Vertex { public class Vertex {

View File

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

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.obj.normals; package com.github.hydos.ginger.engine.obj.normals;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -6,10 +6,9 @@ import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.utils.Loader;
import io.github.hydos.ginger.engine.utils.Loader;
public class NormalMappedObjLoader { public class NormalMappedObjLoader {

View File

@ -1,9 +1,9 @@
package io.github.hydos.ginger.engine.obj.normals; package com.github.hydos.ginger.engine.obj.normals;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class VertexNM { public class VertexNM {

View File

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

View File

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

View File

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

View File

@ -1,10 +1,9 @@
package io.github.hydos.ginger.engine.particle; package com.github.hydos.ginger.engine.particle;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.main.settings.Constants;
import io.github.hydos.ginger.main.settings.Constants;
public class Particle { public class Particle {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.particle; package com.github.hydos.ginger.engine.particle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -7,9 +7,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.render.renderers.ParticleRenderer; import com.github.hydos.ginger.engine.render.renderers.ParticleRenderer;
public class ParticleMaster { public class ParticleMaster {

View File

@ -1,12 +1,12 @@
package io.github.hydos.ginger.engine.particle; package com.github.hydos.ginger.engine.particle;
import java.util.Random; import java.util.Random;
import org.joml.Vector4f; import org.joml.Vector4f;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class ParticleSystem { public class ParticleSystem {

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
package io.github.hydos.ginger.engine.postprocessing; package com.github.hydos.ginger.engine.postprocessing;
import static org.lwjgl.opengl.ARBFramebufferObject.*; import static org.lwjgl.opengl.ARBFramebufferObject.*;
@ -12,7 +12,7 @@ import org.lwjgl.glfw.GLFWFramebufferSizeCallback;
import org.lwjgl.glfw.GLFWKeyCallback; import org.lwjgl.glfw.GLFWKeyCallback;
import org.lwjgl.system.Callback; import org.lwjgl.system.Callback;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
public class Fbo { public class Fbo {

View File

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

View File

@ -1,11 +1,11 @@
package io.github.hydos.ginger.engine.postprocessing; package com.github.hydos.ginger.engine.postprocessing;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.utils.Loader; import com.github.hydos.ginger.engine.utils.Loader;
public class PostProcessing { public class PostProcessing {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render; package com.github.hydos.ginger.engine.render;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -9,23 +9,16 @@ import org.joml.Vector4f;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL13;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.elements.GuiTexture; import com.github.hydos.ginger.engine.elements.GuiTexture;
import io.github.hydos.ginger.engine.elements.objects.RenderObject; import com.github.hydos.ginger.engine.elements.objects.*;
import io.github.hydos.ginger.engine.elements.objects.Light; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.render.models.TexturedModel;
import io.github.hydos.ginger.engine.render.models.TexturedModel; import com.github.hydos.ginger.engine.render.renderers.*;
import io.github.hydos.ginger.engine.render.renderers.EntityRenderer; import com.github.hydos.ginger.engine.render.shaders.*;
import io.github.hydos.ginger.engine.render.renderers.GuiRenderer; import com.github.hydos.ginger.engine.shadow.ShadowMapMasterRenderer;
import io.github.hydos.ginger.engine.render.renderers.NormalMappingRenderer; import com.github.hydos.ginger.engine.terrain.Terrain;
import io.github.hydos.ginger.engine.render.renderers.SkyboxRenderer;
import io.github.hydos.ginger.engine.render.renderers.TerrainRenderer;
import io.github.hydos.ginger.engine.render.shaders.GuiShader;
import io.github.hydos.ginger.engine.render.shaders.StaticShader;
import io.github.hydos.ginger.engine.render.shaders.TerrainShader;
import io.github.hydos.ginger.engine.shadow.ShadowMapMasterRenderer;
import io.github.hydos.ginger.engine.terrain.Terrain;
public class MasterRenderer { public class MasterRenderer {

View File

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

View File

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

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.renderers; package com.github.hydos.ginger.engine.render.renderers;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -8,14 +8,13 @@ import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.elements.objects.RenderObject; import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.render.MasterRenderer; import com.github.hydos.ginger.engine.render.MasterRenderer;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.*;
import io.github.hydos.ginger.engine.render.models.TexturedModel; import com.github.hydos.ginger.engine.render.shaders.StaticShader;
import io.github.hydos.ginger.engine.render.shaders.StaticShader; import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import io.github.hydos.ginger.engine.render.texture.ModelTexture;
public class EntityRenderer { public class EntityRenderer {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.renderers; package com.github.hydos.ginger.engine.render.renderers;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -9,9 +9,8 @@ import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.font.FontType; import com.github.hydos.ginger.engine.font.*;
import io.github.hydos.ginger.engine.font.GUIText; import com.github.hydos.ginger.engine.render.shaders.FontShader;
import io.github.hydos.ginger.engine.render.shaders.FontShader;
public class FontRenderer { public class FontRenderer {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.renderers; package com.github.hydos.ginger.engine.render.renderers;
import java.util.List; import java.util.List;
@ -7,12 +7,12 @@ import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.elements.GuiTexture; import com.github.hydos.ginger.engine.elements.GuiTexture;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.render.shaders.GuiShader; import com.github.hydos.ginger.engine.render.shaders.GuiShader;
import io.github.hydos.ginger.engine.utils.Loader; import com.github.hydos.ginger.engine.utils.Loader;
public class GuiRenderer { public class GuiRenderer {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.renderers; package com.github.hydos.ginger.engine.render.renderers;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -9,17 +9,15 @@ import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.elements.objects.RenderObject; import com.github.hydos.ginger.engine.elements.objects.*;
import io.github.hydos.ginger.engine.elements.objects.Light; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.render.MasterRenderer;
import io.github.hydos.ginger.engine.render.MasterRenderer; import com.github.hydos.ginger.engine.render.models.*;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.shaders.NormalMappingShader;
import io.github.hydos.ginger.engine.render.models.TexturedModel; import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import io.github.hydos.ginger.engine.render.shaders.NormalMappingShader;
import io.github.hydos.ginger.engine.render.texture.ModelTexture;
public class NormalMappingRenderer { public class NormalMappingRenderer {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.renderers; package com.github.hydos.ginger.engine.render.renderers;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.util.List; import java.util.List;
@ -11,15 +11,14 @@ import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL31; import org.lwjgl.opengl.GL31;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
import io.github.hydos.ginger.engine.particle.Particle; import com.github.hydos.ginger.engine.particle.*;
import io.github.hydos.ginger.engine.particle.ParticleTexture; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.shaders.ParticleShader;
import io.github.hydos.ginger.engine.render.shaders.ParticleShader; import com.github.hydos.ginger.engine.utils.Loader;
import io.github.hydos.ginger.engine.utils.Loader;
public class ParticleRenderer { public class ParticleRenderer {

View File

@ -1,15 +1,15 @@
package io.github.hydos.ginger.engine.render.renderers; package com.github.hydos.ginger.engine.render.renderers;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.render.shaders.SkyboxShader; import com.github.hydos.ginger.engine.render.shaders.SkyboxShader;
import io.github.hydos.ginger.engine.utils.Loader; import com.github.hydos.ginger.engine.utils.Loader;
public class SkyboxRenderer { public class SkyboxRenderer {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.renderers; package com.github.hydos.ginger.engine.render.renderers;
import java.util.List; import java.util.List;
@ -7,14 +7,12 @@ import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.render.shaders.TerrainShader; import com.github.hydos.ginger.engine.render.shaders.TerrainShader;
import io.github.hydos.ginger.engine.terrain.Terrain; import com.github.hydos.ginger.engine.terrain.*;
import io.github.hydos.ginger.engine.terrain.TerrainTexture;
import io.github.hydos.ginger.engine.terrain.TerrainTexturePack;
public class TerrainRenderer { public class TerrainRenderer {

View File

@ -1,8 +1,7 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import io.github.hydos.ginger.engine.font.GUIText; import com.github.hydos.ginger.engine.font.GUIText;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
public class FontShader extends ShaderProgram{ public class FontShader extends ShaderProgram{

View File

@ -1,6 +1,6 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
public class GuiShader extends ShaderProgram{ public class GuiShader extends ShaderProgram{

View File

@ -1,13 +1,12 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import java.util.List; import java.util.List;
import org.joml.Vector4f; import org.joml.Vector4f;
import io.github.hydos.ginger.engine.elements.objects.Light; import com.github.hydos.ginger.engine.elements.objects.Light;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
public class NormalMappingShader extends ShaderProgram{ public class NormalMappingShader extends ShaderProgram{

View File

@ -1,6 +1,6 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
public class ParticleShader extends ShaderProgram { public class ParticleShader extends ShaderProgram {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -10,9 +10,8 @@ import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
public abstract class ShaderProgram { public abstract class ShaderProgram {

View File

@ -1,8 +1,8 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
public class SkyboxShader extends ShaderProgram{ public class SkyboxShader extends ShaderProgram{

View File

@ -1,12 +1,12 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import java.util.List; import java.util.List;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.elements.objects.Light; import com.github.hydos.ginger.engine.elements.objects.Light;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class StaticShader extends ShaderProgram{ public class StaticShader extends ShaderProgram{

View File

@ -1,12 +1,12 @@
package io.github.hydos.ginger.engine.render.shaders; package com.github.hydos.ginger.engine.render.shaders;
import java.util.List; import java.util.List;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.elements.objects.Light; import com.github.hydos.ginger.engine.elements.objects.Light;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class TerrainShader extends ShaderProgram{ public class TerrainShader extends ShaderProgram{

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.render.texture; package com.github.hydos.ginger.engine.render.texture;
import static org.lwjgl.stb.STBImage.stbi_failure_reason; import static org.lwjgl.stb.STBImage.stbi_failure_reason;
import static org.lwjgl.stb.STBImage.stbi_info_from_memory; import static org.lwjgl.stb.STBImage.stbi_info_from_memory;
@ -11,7 +11,7 @@ import java.nio.IntBuffer;
import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryStack;
import io.github.hydos.ginger.engine.render.tools.IOUtil; import com.github.hydos.ginger.engine.render.tools.IOUtil;
public class Image { public class Image {

View File

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

View File

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

View File

@ -1,14 +1,13 @@
package io.github.hydos.ginger.engine.render.tools; package com.github.hydos.ginger.engine.render.tools;
import org.joml.Vector4f; import org.joml.Vector4f;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.terrain.Terrain;
import io.github.hydos.ginger.engine.terrain.Terrain;
public class MousePicker { public class MousePicker {

View File

@ -1,12 +1,12 @@
package io.github.hydos.ginger.engine.shadow; package com.github.hydos.ginger.engine.shadow;
import org.joml.Vector4f; import org.joml.Vector4f;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.math.vectors.Vector3f;
import io.github.hydos.ginger.engine.render.MasterRenderer; import com.github.hydos.ginger.engine.render.MasterRenderer;
/** /**
* Represents the 3D cuboidal area of the world in which objects will cast * Represents the 3D cuboidal area of the world in which objects will cast

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.shadow; package com.github.hydos.ginger.engine.shadow;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL32; import org.lwjgl.opengl.GL32;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
/** /**
* The frame buffer for the shadow pass. This class sets up the depth texture * The frame buffer for the shadow pass. This class sets up the depth texture

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.shadow; package com.github.hydos.ginger.engine.shadow;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -8,12 +8,11 @@ import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import io.github.hydos.ginger.engine.elements.objects.RenderObject; import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.render.MasterRenderer; import com.github.hydos.ginger.engine.render.MasterRenderer;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.*;
import io.github.hydos.ginger.engine.render.models.TexturedModel;
public class ShadowMapEntityRenderer { public class ShadowMapEntityRenderer {

View File

@ -1,17 +1,15 @@
package io.github.hydos.ginger.engine.shadow; package com.github.hydos.ginger.engine.shadow;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import io.github.hydos.ginger.engine.cameras.Camera; import com.github.hydos.ginger.engine.cameras.Camera;
import io.github.hydos.ginger.engine.elements.objects.RenderObject; import com.github.hydos.ginger.engine.elements.objects.*;
import io.github.hydos.ginger.engine.elements.objects.Light; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.render.models.TexturedModel;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
import io.github.hydos.ginger.engine.render.models.TexturedModel;
/** /**
* This class is in charge of using all of the classes in the shadows package to * This class is in charge of using all of the classes in the shadows package to

View File

@ -1,7 +1,7 @@
package io.github.hydos.ginger.engine.shadow; package com.github.hydos.ginger.engine.shadow;
import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import io.github.hydos.ginger.engine.render.shaders.ShaderProgram; import com.github.hydos.ginger.engine.render.shaders.ShaderProgram;
public class ShadowShader extends ShaderProgram { public class ShadowShader extends ShaderProgram {

View File

@ -1,16 +1,15 @@
package io.github.hydos.ginger.engine.terrain; package com.github.hydos.ginger.engine.terrain;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import io.github.hydos.ginger.engine.math.Maths; import com.github.hydos.ginger.engine.math.Maths;
import io.github.hydos.ginger.engine.math.vectors.Vector2f; import com.github.hydos.ginger.engine.math.vectors.*;
import io.github.hydos.ginger.engine.math.vectors.Vector3f; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.utils.Loader;
import io.github.hydos.ginger.engine.utils.Loader; import com.github.hydos.ginger.main.settings.Constants;
import io.github.hydos.ginger.main.settings.Constants;
public class Terrain { public class Terrain {

View File

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

View File

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

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.engine.utils; package com.github.hydos.ginger.engine.utils;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
@ -15,11 +15,10 @@ import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL33; import org.lwjgl.opengl.GL33;
import io.github.hydos.ginger.engine.io.Window; import com.github.hydos.ginger.engine.io.Window;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.RawModel;
import io.github.hydos.ginger.engine.render.texture.Image; import com.github.hydos.ginger.engine.render.texture.*;
import io.github.hydos.ginger.engine.render.texture.ModelTexture; import com.github.hydos.ginger.engine.terrain.TerrainTexture;
import io.github.hydos.ginger.engine.terrain.TerrainTexture;
public class Loader { public class Loader {

View File

@ -1,12 +1,11 @@
package io.github.hydos.ginger.main; package com.github.hydos.ginger.main;
import io.github.hydos.ginger.engine.font.TextMaster; import com.github.hydos.ginger.engine.font.TextMaster;
import io.github.hydos.ginger.engine.obj.ModelLoader; import com.github.hydos.ginger.engine.obj.ModelLoader;
import io.github.hydos.ginger.engine.obj.normals.NormalMappedObjLoader; import com.github.hydos.ginger.engine.obj.normals.NormalMappedObjLoader;
import io.github.hydos.ginger.engine.render.MasterRenderer; import com.github.hydos.ginger.engine.render.MasterRenderer;
import io.github.hydos.ginger.engine.render.models.RawModel; import com.github.hydos.ginger.engine.render.models.*;
import io.github.hydos.ginger.engine.render.models.TexturedModel; import com.github.hydos.ginger.engine.render.texture.ModelTexture;
import io.github.hydos.ginger.engine.render.texture.ModelTexture;
public class GingerMain { public class GingerMain {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.main.settings; package com.github.hydos.ginger.main.settings;
public class Constants { public class Constants {

View File

@ -1,4 +1,4 @@
package io.github.hydos.ginger.main.tools; package com.github.hydos.ginger.main.tools;
public class GSceneBuilder { public class GSceneBuilder {

View File

@ -0,0 +1,13 @@
package com.github.hydos.litecraft;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.math.vectors.Vector3f;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
public class Block extends RenderObject{
public Block(TexturedModel blockModel, Vector3f position) {
super(blockModel, position, 0, 0, 0, new Vector3f(1f,1f,1f));
}
}

View File

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

View File

@ -1,13 +0,0 @@
package io.github.hydos.litecraft;
import io.github.hydos.ginger.engine.elements.objects.RenderObject;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
import io.github.hydos.ginger.engine.render.models.TexturedModel;
public class Block extends RenderObject{
public Block(TexturedModel blockModel, Vector3f position) {
super(blockModel, position, 0, 0, 0, new Vector3f(1f,1f,1f));
}
}

View File

@ -0,0 +1,21 @@
package tk.valoeghese.gateways.client.io;
/*
* Author: Valoeghese
*/
public final class InitialPressHandler implements KeyListener
{
public InitialPressHandler(KeyCallback callback)
{ this.callback = callback; }
private boolean activatedPreviously = false;
private final KeyCallback callback;
@Override
public void listen(boolean active)
{
if (!activatedPreviously && active)
{ callback.onCallback(); }
activatedPreviously = active;
}
}

View File

@ -0,0 +1,31 @@
package tk.valoeghese.gateways.client.io;
import java.util.*;
/*
* Author: Valoeghese
*/
public class Input
{
private static final Map<Keybind, List<KeyCallback>> CALLBACKS = new HashMap<>();
private static final Map<Keybind, List<KeyListener>> LISTENERS = new HashMap<>();
public static void addPressCallback(Keybind key, KeyCallback callback)
{ CALLBACKS.computeIfAbsent(key, listener -> new ArrayList<>()).add(callback); }
public static void addListener(Keybind key, KeyListener callback)
{ LISTENERS.computeIfAbsent(key, listener -> new ArrayList<>()).add(callback); }
public static void invokeAllListeners()
{
CALLBACKS.forEach((keybind, listeners) ->
{
if (keybind.isActive())
{ listeners.forEach(callback -> callback.onCallback()); }
});
LISTENERS.forEach((keybind, listeners) ->
{
listeners.forEach(listener -> listener.listen(keybind.isActive()));
});
}
}

Some files were not shown because too many files have changed in this diff Show More