Make NVGTexture loading method only require context ID

Author: Benjamin Yap

src/com/bwyap/enginedriver/resource/Resource.java

@@ -8,7 +8,6 @@
 import com.bwyap.engine.input.InputMapping;
 import com.bwyap.enginedriver.resource.jsonwrapper.Settings;
 import com.bwyap.lwjgl.engine.gui.nanovg.NVGFont;
-import com.bwyap.lwjgl.engine.gui.nanovg.NVGRenderer;
 import com.bwyap.lwjgl.engine.gui.nanovg.NVGTexture;
 import com.bwyap.lwjgl.engine.render3d.LWJGLTexture;
 import com.bwyap.lwjgl.mesh.OBJLoader;
@@ -171,11 +170,11 @@ public static void loadMeshes() {
 	/**
 	 * Load NVG textures for GUI rendering into the current NanoVG context
 	 */
-	public static void loadNVGTextures(NVGRenderer renderer) {
+	public static void loadNVGTextures(long ctx) {
 		try {
-			testButton = NVGTexture.loadTexture("testButton", TEX_TEST_BUTTON, renderer);
-			testButtonMouseover = NVGTexture.loadTexture("testButtonMouseover", TEX_TEST_BUTTON_MOUSEOVER, renderer);
-			testButtonPressed = NVGTexture.loadTexture("testButtonPressed", TEX_TEST_BUTTON_PRESSED, renderer);
+			testButton = NVGTexture.loadTexture("testButton", TEX_TEST_BUTTON, ctx);
+			testButtonMouseover = NVGTexture.loadTexture("testButtonMouseover", TEX_TEST_BUTTON_MOUSEOVER, ctx);
+			testButtonPressed = NVGTexture.loadTexture("testButtonPressed", TEX_TEST_BUTTON_PRESSED, ctx);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

src/com/bwyap/lwjgl/engine/gui/nanovg/NVGRenderer.java

@@ -110,7 +110,7 @@ public NVGRenderer() throws Exception {
 			throw new Exception("Could not initialise NanoVG");
 
 		// TODO clean this up
-		Resource.loadNVGTextures(this);
+		Resource.loadNVGTextures(getContext());
 
 		loadedFonts = new HashSet<String>();		
 	}

src/com/bwyap/lwjgl/engine/gui/nanovg/NVGTexture.java

@@ -45,9 +45,9 @@ public NVGTexture(int textureID, int rows, int cols) {
 	 * @return
 	 * @throws IOException 
 	 */
-	public static NVGTexture loadTexture(String name, String path, NVGRenderer renderer) throws IOException {
+	public static NVGTexture loadTexture(String name, String path, long ctx) throws IOException {
 		ByteBuffer img = ioResourceToByteBuffer(path, 64*64);
-		int textureID = nvgCreateImageMem(renderer.getContext(), 0, img);
+		int textureID = nvgCreateImageMem(ctx, 0, img);
 		loadedTextures.put(name, textureID);
 		return new NVGTexture(textureID);
 	}
@@ -61,8 +61,8 @@ public static NVGTexture loadTexture(String name, String path, NVGRenderer rende
 	 * @return
 	 * @throws IOException
 	 */
-	public static NVGTexture loadTexture(String name, String path, NVGRenderer renderer, int row, int col) throws IOException {
-		return new NVGTexture(loadTexture(name, path, renderer).getID(), row, col);
+	public static NVGTexture loadTexture(String name, String path, long ctx, int row, int col) throws IOException {
+		return new NVGTexture(loadTexture(name, path, ctx).getID(), row, col);
 	}