From e122b2f92b2302362569cdc9a67efd5750f46eb1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 8 May 2011 05:21:50 +0200 Subject: Graph: GLSL fix, Adding renderModes bits instead of dedicated booleans, Region/GLRegion, .. GLSL fix: - allowing #version tag - add uniform textureSize (ES2) - fix int/float conversion Region/GLRegion: - non OpenGL Region and GL related GLRegion split Region/Renderer renderModes bits (def. in Region) - user creates a Renderer* impl .. and derive Region*'s from outline, possibly from a different code path. - to avoid mode explosion, a bit field is being used for now - Renderer: remove flushCache(), since non caching impl. is intended, or caching by an external user transparent object. --- .../com/jogamp/graph/curve/RegionFactory.java | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100755 src/jogl/classes/com/jogamp/graph/curve/RegionFactory.java (limited to 'src/jogl/classes/com/jogamp/graph/curve/RegionFactory.java') diff --git a/src/jogl/classes/com/jogamp/graph/curve/RegionFactory.java b/src/jogl/classes/com/jogamp/graph/curve/RegionFactory.java deleted file mode 100755 index 23b318e8a..000000000 --- a/src/jogl/classes/com/jogamp/graph/curve/RegionFactory.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Copyright 2010 JogAmp Community. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of JogAmp Community. - */ -package com.jogamp.graph.curve; - -import javax.media.opengl.GLProfile; - -import com.jogamp.graph.curve.opengl.RenderState; - -import jogamp.graph.curve.opengl.VBORegionSPES2; -import jogamp.graph.curve.opengl.VBORegion2PES2; - -/** RegionFactory to create a Context specific Region implementation. - * - * @see Region - */ -public class RegionFactory { - - /** - * Create a Region using the passed curren GL object. - * - *

In case {@link Region#TWO_PASS} is being requested the default texture unit - * {@link Region#TWO_PASS_DEFAULT_TEXTURE_UNIT} is being used.

- * @param rs TODO - * @param type can be one of {@link Region#SINGLE_PASS} or {@link Region#TWO_PASS} - * - * @return region - */ - public static Region create(RenderState rs, int type) { - if( Region.TWO_PASS == type ){ - return new VBORegion2PES2(rs, Region.TWO_PASS_DEFAULT_TEXTURE_UNIT); - } - else{ - return new VBORegionSPES2(rs); - } - } - - public static Region createSinglePass(RenderState rs) { - return new VBORegionSPES2(rs); - } - - public static Region createTwoPass(RenderState rs, int textureUnit) { - return new VBORegion2PES2(rs, textureUnit); - } -} -- cgit v1.2.3