pull/4/head
hYdos 2020-02-24 15:36:20 +10:00 committed by halotroop2288
parent 2361580925
commit 96c6c507cb
4 changed files with 12 additions and 9 deletions

View File

@ -5,13 +5,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>

View File

@ -61,7 +61,6 @@ public class Example extends Game{
//TODO: rename entity class to object class because not just entities
List<Block> chunk = new ArrayList<Block>();
//Basic chunk generation
TexturedModel activeModel = dirtModel;
for(int k = 0; k<8;k++) {
if(k == 7) {

View File

@ -1,6 +1,14 @@
package com.github.hydos.litecraft;
public abstract class Entity extends RenderEntity{
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 abstract class Entity extends RenderObject{
public Entity(TexturedModel model, Vector3f position, float rotX, float rotY, float rotZ, Vector3f scale) {
super(model, position, rotX, rotY, rotZ, scale);
}

View File

@ -17,6 +17,8 @@ uniform vec3 skyColour;
void main(void){
float brightness = 3;
vec3 unitNormal = normalize(surfaceNormal);
vec3 unitVectorToCamera = normalize(toCameraVector);
@ -46,5 +48,6 @@ void main(void){
out_Color = vec4(totalDiffuse, 1.0) * textureColour + vec4(totalSpecular, 1.0);
out_Color = mix(vec4(skyColour, 1.0), out_Color, visibility);
out_Color = vec4(out_Color.r*brightness, out_Color.b*brightness, out_Color.g*brightness, out_Color.a);
}