add comments and adjust formatting

This commit is contained in:
Peter Tissen 2015-06-25 00:21:15 +02:00
parent 1993452669
commit 600e34d1fe
4 changed files with 22 additions and 11 deletions

View File

@ -133,7 +133,7 @@ public class Container extends AppGameContainer {
// reset BeatmapSetList data // reset BeatmapSetList data
if (BeatmapSetList.get() != null) if (BeatmapSetList.get() != null)
BeatmapSetList.get().reset(); BeatmapSetList.get().reset();
// delete OpenGL objects involved in the Curve rendering // delete OpenGL objects involved in the Curve rendering
CurveRenderState.shutdown(); CurveRenderState.shutdown();
} }

View File

@ -75,7 +75,12 @@ public class CurveRenderState {
//scale = scale * 118 / 128; //for curves exactly as big as the sliderball //scale = scale * 118 / 128; //for curves exactly as big as the sliderball
FrameBufferCache.init(width, height); FrameBufferCache.init(width, height);
} }
/**
* Undo the static state. Static state setup caused by calls to
* {@link #draw(org.newdawn.slick.Color, org.newdawn.slick.Color, itdelatrisu.opsu.objects.curves.Vec2f[])}
* are undone.
*/
public static void shutdown() public static void shutdown()
{ {
staticState.shutdown(); staticState.shutdown();
@ -144,7 +149,7 @@ public class CurveRenderState {
} }
/** /**
* Discard the cache. * Discard the cache mapping for this curve object
*/ */
public void discardCache() { public void discardCache() {
fbo = null; fbo = null;
@ -454,14 +459,17 @@ public class CurveRenderState {
} }
} }
/**
* Cleanup any OpenGL objects that may have been initialized.
*/
private void shutdown() private void shutdown()
{ {
if(gradientTexture != 0) if(gradientTexture != 0)
{ {
GL11.glDeleteTextures(gradientTexture); GL11.glDeleteTextures(gradientTexture);
gradientTexture = 0; gradientTexture = 0;
} }
if(program != 0) if(program != 0)
{ {
GL20.glDeleteProgram(program); GL20.glDeleteProgram(program);

View File

@ -122,11 +122,14 @@ public class FrameBufferCache {
return buffer; return buffer;
} }
/**
* Clear the cache pool of Framebuffers.
* If there were any previous Framebuffers in the cache delete them
* this is necessary for cases when the game gets re-started with a
* different resolution without closing the process
*/
public static void shutdown() public static void shutdown()
{ {
//if there were any previous Framebuffers in the cache delete them
//this is necessary for cases when the game gets re-started with a
//different resolution without closing the process
FrameBufferCache fbcInstance = FrameBufferCache.getInstance(); FrameBufferCache fbcInstance = FrameBufferCache.getInstance();
for(Rendertarget target: fbcInstance.cache) for(Rendertarget target: fbcInstance.cache)
{ {

View File

@ -40,7 +40,7 @@ public class Rendertarget {
/** The renderbuffer ID for the depth buffer that this rendertarget renders into. */ /** The renderbuffer ID for the depth buffer that this rendertarget renders into. */
private final int depthBufferID; private final int depthBufferID;
/** /**
* Create a new FBO. * Create a new FBO.
* @param width the width * @param width the width
@ -115,7 +115,7 @@ public class Rendertarget {
return buffer; return buffer;
} }
/** /**
* Destroy the OpenGL objects associated with this Rendertarget. Do not try * Destroy the OpenGL objects associated with this Rendertarget. Do not try
* to use this rendertarget with OpenGL after calling this method. * to use this rendertarget with OpenGL after calling this method.