changes to facilitate android port, update copyright notices

This commit is contained in:
codeanticode
2015-09-12 14:10:01 -04:00
parent e56547f2d1
commit 19ff731e7c
27 changed files with 361 additions and 1077 deletions

View File

@@ -1,14 +1,16 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Processing project - http://processing.org
Processing OpenGL (c) 2011-2015 Andres Colubri
Copyright (c) 2011-12 Ben Fry and Casey Reas
Part of the Processing project - http://processing.org
Copyright (c) 2001-04 Massachusetts Institute of Technology
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2012-15 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +21,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
package processing.opengl;
@@ -150,31 +152,6 @@ public class FrameBuffer implements PConstants {
}
// @Override
// protected void finalize() throws Throwable {
// try {
// if (!screenFb) {
// if (glFbo != 0) {
// PGraphicsOpenGL.finalizeFrameBufferObject(glFbo, context);
// }
// if (glDepth != 0) {
// PGraphicsOpenGL.finalizeRenderBufferObject(glDepth, context);
// }
// if (glStencil != 0) {
// PGraphicsOpenGL.finalizeRenderBufferObject(glStencil, context);
// }
// if (glMultisample != 0) {
// PGraphicsOpenGL.finalizeRenderBufferObject(glMultisample, context);
// }
// if (glDepthStencil != 0) {
// PGraphicsOpenGL.finalizeRenderBufferObject(glDepthStencil, context);
// }
// }
// } finally {
// super.finalize();
// }
// }
public void clear() {
pg.pushFramebuffer();
pg.setFramebuffer(this);