diff --git a/src/java/org/lwjgl/test/input/ControllerCreationTest.java b/src/java/org/lwjgl/test/input/ControllerCreationTest.java index 66f04af8..0278c015 100644 --- a/src/java/org/lwjgl/test/input/ControllerCreationTest.java +++ b/src/java/org/lwjgl/test/input/ControllerCreationTest.java @@ -37,7 +37,7 @@ import org.lwjgl.Sys; import org.lwjgl.input.Controller; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Window; -import org.lwjgl.vector.Vector2f; +import org.lwjgl.util.vector.Vector2f; /** * $Id$ diff --git a/src/java/org/lwjgl/test/input/ControllerTest.java b/src/java/org/lwjgl/test/input/ControllerTest.java index 30fd1db4..17d8b5f5 100644 --- a/src/java/org/lwjgl/test/input/ControllerTest.java +++ b/src/java/org/lwjgl/test/input/ControllerTest.java @@ -35,8 +35,8 @@ import org.lwjgl.input.Controller; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Window; -import org.lwjgl.vector.Vector2f; -import org.lwjgl.vector.Vector3f; +import org.lwjgl.util.vector.Vector2f; +import org.lwjgl.util.vector.Vector3f; /** * $Id$ diff --git a/src/java/org/lwjgl/test/input/KeyboardTest.java b/src/java/org/lwjgl/test/input/KeyboardTest.java index 2fcf3eae..19313b4b 100644 --- a/src/java/org/lwjgl/test/input/KeyboardTest.java +++ b/src/java/org/lwjgl/test/input/KeyboardTest.java @@ -36,7 +36,7 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Window; import org.lwjgl.opengl.glu.GLU; -import org.lwjgl.vector.Vector2f; +import org.lwjgl.util.vector.Vector2f; /** * $Id$ diff --git a/src/java/org/lwjgl/test/input/MouseCreationTest.java b/src/java/org/lwjgl/test/input/MouseCreationTest.java index 7b70a3a0..7132a8e2 100644 --- a/src/java/org/lwjgl/test/input/MouseCreationTest.java +++ b/src/java/org/lwjgl/test/input/MouseCreationTest.java @@ -37,7 +37,7 @@ import org.lwjgl.Sys; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Window; -import org.lwjgl.vector.Vector2f; +import org.lwjgl.util.vector.Vector2f; /** * $Id$ diff --git a/src/java/org/lwjgl/test/input/MouseTest.java b/src/java/org/lwjgl/test/input/MouseTest.java index 12c9f54b..faeaeb68 100644 --- a/src/java/org/lwjgl/test/input/MouseTest.java +++ b/src/java/org/lwjgl/test/input/MouseTest.java @@ -35,8 +35,8 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Window; -import org.lwjgl.vector.Vector2f; -import org.lwjgl.vector.Vector3f; +import org.lwjgl.util.vector.Vector2f; +import org.lwjgl.util.vector.Vector3f; /** * $Id$ diff --git a/src/java/org/lwjgl/test/openal/MovingSoundTest.java b/src/java/org/lwjgl/test/openal/MovingSoundTest.java index f6577ea3..0223a0a5 100644 --- a/src/java/org/lwjgl/test/openal/MovingSoundTest.java +++ b/src/java/org/lwjgl/test/openal/MovingSoundTest.java @@ -39,7 +39,7 @@ import org.lwjgl.openal.eax.EAX; import org.lwjgl.openal.eax.EAX20; import org.lwjgl.openal.eax.EAXListenerProperties; import org.lwjgl.opengl.Window; -import org.lwjgl.vector.Vector3f; +import org.lwjgl.util.vector.Vector3f; /** * $Id$ diff --git a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java index c8b19651..b4af1d81 100644 --- a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java +++ b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java @@ -37,7 +37,7 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Window; import org.lwjgl.opengl.glu.GLU; -import org.lwjgl.vector.Vector2f; +import org.lwjgl.util.vector.Vector2f; /** * $Id$ diff --git a/src/java/org/lwjgl/test/opengl/PbufferTest.java b/src/java/org/lwjgl/test/opengl/PbufferTest.java index a643ff8e..fc223beb 100644 --- a/src/java/org/lwjgl/test/opengl/PbufferTest.java +++ b/src/java/org/lwjgl/test/opengl/PbufferTest.java @@ -42,7 +42,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Pbuffer; import org.lwjgl.opengl.Window; import org.lwjgl.opengl.glu.GLU; -import org.lwjgl.vector.Vector2f; +import org.lwjgl.util.vector.Vector2f; /** * $Id$ diff --git a/src/java/org/lwjgl/util/model/renderer/Renderer.java b/src/java/org/lwjgl/util/model/renderer/Renderer.java index 4bea3b4c..f3cbc1d8 100644 --- a/src/java/org/lwjgl/util/model/renderer/Renderer.java +++ b/src/java/org/lwjgl/util/model/renderer/Renderer.java @@ -65,6 +65,10 @@ public class Renderer { * @param model The model to render */ public void render(Model model) { + + // 1. Set up GL state from the Model's material + Renderable material = (Renderable) materials.get(model.getMesh().getMaterial()); + } /** diff --git a/src/java/org/lwjgl/vector/Matrix.java b/src/java/org/lwjgl/util/vector/Matrix.java similarity index 99% rename from src/java/org/lwjgl/vector/Matrix.java rename to src/java/org/lwjgl/util/vector/Matrix.java index 2fa70395..595ad100 100644 --- a/src/java/org/lwjgl/vector/Matrix.java +++ b/src/java/org/lwjgl/util/vector/Matrix.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/Matrix2f.java b/src/java/org/lwjgl/util/vector/Matrix2f.java similarity index 99% rename from src/java/org/lwjgl/vector/Matrix2f.java rename to src/java/org/lwjgl/util/vector/Matrix2f.java index c6bfe33c..cf9aa79f 100644 --- a/src/java/org/lwjgl/vector/Matrix2f.java +++ b/src/java/org/lwjgl/util/vector/Matrix2f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/Matrix3f.java b/src/java/org/lwjgl/util/vector/Matrix3f.java similarity index 99% rename from src/java/org/lwjgl/vector/Matrix3f.java rename to src/java/org/lwjgl/util/vector/Matrix3f.java index cdc00caf..dc0a9130 100644 --- a/src/java/org/lwjgl/vector/Matrix3f.java +++ b/src/java/org/lwjgl/util/vector/Matrix3f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/Matrix4f.java b/src/java/org/lwjgl/util/vector/Matrix4f.java similarity index 99% rename from src/java/org/lwjgl/vector/Matrix4f.java rename to src/java/org/lwjgl/util/vector/Matrix4f.java index 93dd97eb..c0b440ce 100644 --- a/src/java/org/lwjgl/vector/Matrix4f.java +++ b/src/java/org/lwjgl/util/vector/Matrix4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/ReadableVector.java b/src/java/org/lwjgl/util/vector/ReadableVector.java similarity index 98% rename from src/java/org/lwjgl/vector/ReadableVector.java rename to src/java/org/lwjgl/util/vector/ReadableVector.java index ba1e8dfd..8d9b584b 100644 --- a/src/java/org/lwjgl/vector/ReadableVector.java +++ b/src/java/org/lwjgl/util/vector/ReadableVector.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/ReadableVector2f.java b/src/java/org/lwjgl/util/vector/ReadableVector2f.java similarity index 98% rename from src/java/org/lwjgl/vector/ReadableVector2f.java rename to src/java/org/lwjgl/util/vector/ReadableVector2f.java index 61e974b2..cc6828f6 100644 --- a/src/java/org/lwjgl/vector/ReadableVector2f.java +++ b/src/java/org/lwjgl/util/vector/ReadableVector2f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; /** * @author foo diff --git a/src/java/org/lwjgl/vector/ReadableVector3f.java b/src/java/org/lwjgl/util/vector/ReadableVector3f.java similarity index 98% rename from src/java/org/lwjgl/vector/ReadableVector3f.java rename to src/java/org/lwjgl/util/vector/ReadableVector3f.java index 6f6902a6..eff8cc4d 100644 --- a/src/java/org/lwjgl/vector/ReadableVector3f.java +++ b/src/java/org/lwjgl/util/vector/ReadableVector3f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; /** * @author foo diff --git a/src/java/org/lwjgl/vector/ReadableVector4f.java b/src/java/org/lwjgl/util/vector/ReadableVector4f.java similarity index 98% rename from src/java/org/lwjgl/vector/ReadableVector4f.java rename to src/java/org/lwjgl/util/vector/ReadableVector4f.java index 02f2350a..003a584a 100644 --- a/src/java/org/lwjgl/vector/ReadableVector4f.java +++ b/src/java/org/lwjgl/util/vector/ReadableVector4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; /** * @author foo diff --git a/src/java/org/lwjgl/vector/Vector.java b/src/java/org/lwjgl/util/vector/Vector.java similarity index 98% rename from src/java/org/lwjgl/vector/Vector.java rename to src/java/org/lwjgl/util/vector/Vector.java index f8ca851b..709b63d2 100644 --- a/src/java/org/lwjgl/vector/Vector.java +++ b/src/java/org/lwjgl/util/vector/Vector.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/Vector2f.java b/src/java/org/lwjgl/util/vector/Vector2f.java similarity index 99% rename from src/java/org/lwjgl/vector/Vector2f.java rename to src/java/org/lwjgl/util/vector/Vector2f.java index 845a666a..661b0295 100644 --- a/src/java/org/lwjgl/vector/Vector2f.java +++ b/src/java/org/lwjgl/util/vector/Vector2f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/Vector3f.java b/src/java/org/lwjgl/util/vector/Vector3f.java similarity index 99% rename from src/java/org/lwjgl/vector/Vector3f.java rename to src/java/org/lwjgl/util/vector/Vector3f.java index 78fcb110..2e62a881 100644 --- a/src/java/org/lwjgl/vector/Vector3f.java +++ b/src/java/org/lwjgl/util/vector/Vector3f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/vector/Vector4f.java b/src/java/org/lwjgl/util/vector/Vector4f.java similarity index 99% rename from src/java/org/lwjgl/vector/Vector4f.java rename to src/java/org/lwjgl/util/vector/Vector4f.java index 128bab17..85086949 100644 --- a/src/java/org/lwjgl/vector/Vector4f.java +++ b/src/java/org/lwjgl/util/vector/Vector4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.vector; +package org.lwjgl.util.vector; import java.io.Serializable; import java.nio.FloatBuffer;