diff --git a/bin/Scene/Objects/Copyleft.class b/bin/Scene/Objects/Copyleft.class index dac669e..0d34152 100644 Binary files a/bin/Scene/Objects/Copyleft.class and b/bin/Scene/Objects/Copyleft.class differ diff --git a/bin/Scene/Objects/Cube.class b/bin/Scene/Objects/Cube.class index bf56e51..3993aaa 100644 Binary files a/bin/Scene/Objects/Cube.class and b/bin/Scene/Objects/Cube.class differ diff --git a/bin/Scene/Objects/Player.class b/bin/Scene/Objects/Player.class index f14204f..ce88735 100644 Binary files a/bin/Scene/Objects/Player.class and b/bin/Scene/Objects/Player.class differ diff --git a/bin/Scene/Objects/TestObj.class b/bin/Scene/Objects/TestObj.class deleted file mode 100644 index 682007c..0000000 Binary files a/bin/Scene/Objects/TestObj.class and /dev/null differ diff --git a/bin/Scene/Objects/Wall.class b/bin/Scene/Objects/Wall.class index 1f429cf..515e168 100644 Binary files a/bin/Scene/Objects/Wall.class and b/bin/Scene/Objects/Wall.class differ diff --git a/bin/Scene/skybox/Skybox.class b/bin/Scene/skybox/Skybox.class index 6e1c512..59b96db 100644 Binary files a/bin/Scene/skybox/Skybox.class and b/bin/Scene/skybox/Skybox.class differ diff --git a/src/Scene/Objects/Copyleft.java b/src/Scene/Objects/Copyleft.java index ad968e5..d59c717 100644 --- a/src/Scene/Objects/Copyleft.java +++ b/src/Scene/Objects/Copyleft.java @@ -3,7 +3,7 @@ package Scene.Objects; import Scene.base.SceneObject; import base.GraphicsObjects.Point4f; import base.GraphicsObjects.Vector4f; -import base.objects3D.TexCube; +import base.objects3D.DisplayListTexCube; import org.lwjgl.opengl.GL11; import org.newdawn.slick.Color; import org.newdawn.slick.opengl.Texture; @@ -18,7 +18,7 @@ import java.util.HashMap; * @Description: **/ public class Copyleft extends SceneObject { - private TexCube cube = new TexCube(); + private DisplayListTexCube cube = new DisplayListTexCube(); public Copyleft(Point4f origin, Point4f position, Vector4f scale) { super(origin, position, scale); @@ -46,7 +46,7 @@ public class Copyleft extends SceneObject { ; // GL11.glDisable(GL11.GL_LIGHTING); // switch lighting off GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); - cube.DrawTexCube(1f); + cube.DrawTexCube(); // GL11.glEnable(GL11.GL_LIGHTING); // switch lighting off ; diff --git a/src/Scene/Objects/Cube.java b/src/Scene/Objects/Cube.java index 20e7851..3fca921 100644 --- a/src/Scene/Objects/Cube.java +++ b/src/Scene/Objects/Cube.java @@ -3,7 +3,8 @@ package Scene.Objects; import Scene.base.SceneObject; import base.GraphicsObjects.Point4f; import base.GraphicsObjects.Vector4f; -import base.objects3D.TexCube; +import base.objects3D.DisplayListTexCube; + import org.lwjgl.opengl.GL11; import org.newdawn.slick.Color; import org.newdawn.slick.opengl.Texture; @@ -18,7 +19,7 @@ import java.util.HashMap; * @Description: **/ public class Cube extends SceneObject { - private TexCube cube = new TexCube(); + private DisplayListTexCube cube = new DisplayListTexCube(); public Cube(Point4f origin, Point4f position, Vector4f scale) { super(origin, position, scale); @@ -45,7 +46,7 @@ public class Cube extends SceneObject { getTextures().get("default_dirt").bind(); ; GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); - cube.DrawTexCube(1f); + cube.DrawTexCube(); ; } diff --git a/src/Scene/Objects/Player.java b/src/Scene/Objects/Player.java index c2ceb9d..33d31de 100644 --- a/src/Scene/Objects/Player.java +++ b/src/Scene/Objects/Player.java @@ -198,12 +198,12 @@ public class Player extends SceneObject { LimbRotation = 0; } - //a sphere for drawing - Sphere sphere = new Sphere(); - //a sphere with texture - TexSphere texSphere = new TexSphere(); - //a cylinder for drawing - Cylinder cylinder = new Cylinder(); +// //a sphere for drawing +// Sphere sphere = new Sphere(); +// //a sphere with texture +// TexSphere texSphere = new TexSphere(); +// //a cylinder for drawing +// Cylinder cylinder = new Cylinder(); //Start to draw GL11.glPushMatrix(); diff --git a/src/Scene/Objects/TestObj.java b/src/Scene/Objects/TestObj.java deleted file mode 100644 index a727f8c..0000000 --- a/src/Scene/Objects/TestObj.java +++ /dev/null @@ -1,39 +0,0 @@ -package Scene.Objects; - -import Scene.base.SceneObject; -import base.GraphicsObjects.Point4f; -import base.GraphicsObjects.Vector4f; -import base.objects3D.Oval; -import org.lwjgl.opengl.GL11; -import org.newdawn.slick.Color; -import org.newdawn.slick.opengl.Texture; - -import java.util.HashMap; - -/** - * @Author: WangYuyang - * @Date: 2021/11/6-00:58 - * @Project: Assignment3 - * @Package: Scene.Objects - * @Description: - **/ -public class TestObj extends SceneObject { - Oval oval = new Oval(); - public TestObj(Point4f origin, Point4f position, Vector4f scale) { - super(origin, position, scale); - } - - public TestObj(Point4f origin, Point4f position, Vector4f scale, HashMap textures) { - super(origin, position, scale, textures); - } - - public TestObj(Point4f origin, Point4f position, Vector4f scale, Vector4f rotation, HashMap textures) { - super(origin, position, scale, rotation, textures); - } - - @Override - public void draw(Integer frame_delta) { - Color.black.bind(); - oval.DrawOval(1, 32); - } -} diff --git a/src/Scene/Objects/Wall.java b/src/Scene/Objects/Wall.java index 1a1cfe6..f02f5d1 100644 --- a/src/Scene/Objects/Wall.java +++ b/src/Scene/Objects/Wall.java @@ -3,6 +3,7 @@ package Scene.Objects; import Scene.base.SceneObject; import base.GraphicsObjects.Point4f; import base.GraphicsObjects.Vector4f; +import base.objects3D.DisplayListTexCube; import base.objects3D.TexCube; import org.lwjgl.opengl.GL11; import org.newdawn.slick.Color; @@ -18,7 +19,7 @@ import java.util.HashMap; * @Description: **/ public class Wall extends SceneObject { - private TexCube MyGrid = new TexCube(); + private DisplayListTexCube MyGrid = new DisplayListTexCube(); public Wall(Point4f origin, Point4f position, Vector4f scale) { super(origin, position, scale); @@ -47,7 +48,7 @@ public class Wall extends SceneObject { // getTextures().get("default_dirt").bind(); ; GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); - MyGrid.DrawTexCube(10f); + MyGrid.DrawTexCube(); ; } diff --git a/src/Scene/skybox/Skybox.java b/src/Scene/skybox/Skybox.java index 95ce10b..ba9bd4a 100644 --- a/src/Scene/skybox/Skybox.java +++ b/src/Scene/skybox/Skybox.java @@ -3,7 +3,8 @@ package Scene.skybox; import Scene.base.SceneObject; import base.GraphicsObjects.Point4f; import base.GraphicsObjects.Vector4f; -import base.objects3D.TexCube; +import base.objects3D.DisplayListTexCube; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.newdawn.slick.Color; @@ -21,7 +22,7 @@ import static org.lwjgl.opengl.GL11.*; * @Description: **/ public class Skybox extends SceneObject { - private TexCube cube = new TexCube(); + private DisplayListTexCube cube = new DisplayListTexCube(); int face1 = glGenLists(1); int face2 = glGenLists(1); int face3 = glGenLists(1);