From c7ebfc9b77701c87a061f3af87ca2a2eef1c08ba Mon Sep 17 00:00:00 2001 From: "sha..rd" Date: Fri, 30 Sep 2011 04:26:46 +0000 Subject: [PATCH] * Deleted useless com.jme3.renderer.layer package git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8319 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/renderer/layer/FrameBufferLayer.java | 63 ------------ .../com/jme3/renderer/layer/MeshLayer.java | 95 ------------------- .../com/jme3/renderer/layer/MiscLayer.java | 65 ------------- .../com/jme3/renderer/layer/ShaderLayer.java | 74 --------------- .../com/jme3/renderer/layer/TextureLayer.java | 64 ------------- 5 files changed, 361 deletions(-) delete mode 100644 engine/src/core/com/jme3/renderer/layer/FrameBufferLayer.java delete mode 100644 engine/src/core/com/jme3/renderer/layer/MeshLayer.java delete mode 100644 engine/src/core/com/jme3/renderer/layer/MiscLayer.java delete mode 100644 engine/src/core/com/jme3/renderer/layer/ShaderLayer.java delete mode 100644 engine/src/core/com/jme3/renderer/layer/TextureLayer.java diff --git a/engine/src/core/com/jme3/renderer/layer/FrameBufferLayer.java b/engine/src/core/com/jme3/renderer/layer/FrameBufferLayer.java deleted file mode 100644 index 1ba79929b..000000000 --- a/engine/src/core/com/jme3/renderer/layer/FrameBufferLayer.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2009-2010 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * 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. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 THE COPYRIGHT OWNER 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. - */ - -package com.jme3.renderer.layer; - -import com.jme3.texture.FrameBuffer; - -/** - * Layer for handling framebuffers - */ -public interface FrameBufferLayer { - - /** - * Copies contents from src to dst, scaling if neccessary. - */ - public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst); - - /** - * Sets the framebuffer that will be drawn to. - */ - public void setFrameBuffer(FrameBuffer fb); - - /** - * Initializes the framebuffer, creating it if neccessary and allocating - * requested renderbuffers. - */ - public void updateFrameBuffer(FrameBuffer fb); - - /** - * Deletes a framebuffer and all attached renderbuffers - */ - public void deleteFrameBuffer(FrameBuffer fb); - -} diff --git a/engine/src/core/com/jme3/renderer/layer/MeshLayer.java b/engine/src/core/com/jme3/renderer/layer/MeshLayer.java deleted file mode 100644 index d713a894b..000000000 --- a/engine/src/core/com/jme3/renderer/layer/MeshLayer.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2009-2010 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * 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. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 THE COPYRIGHT OWNER 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. - */ - -package com.jme3.renderer.layer; - -import com.jme3.scene.Mesh; -import com.jme3.scene.VertexBuffer; - -/** - * Layer for handling meshes. - */ -public interface MeshLayer { - - /** - * Uploads the vertex buffer's data onto the GPU, assiging it an ID if - * needed. - */ - public void updateBufferData(VertexBuffer vb); - - /** - * Deletes a vertex buffer from the GPU. - * @param vb The vertex buffer to delete - */ - public void deleteBuffer(VertexBuffer vb); - - /** - * Sets the vertex attrib. This data is exposed in the shader depending - * on type, e.g Type.Position would be given as inPosition, Type.Tangent is - * given as inTangent, etc. - * - * @param vb - * @throws InvalidArgumentException If the given vertex buffer is an - * index buffer. - */ - public void setVertexAttrib(VertexBuffer vb); - - /** - * Draws the list of triangles given in the index buffer. - * Each triangle is composed of 3 indices to a vertex, the attribs of which - * are supplied using setVertexAttrib. - * The int variable gl_VertexID can be used to access the current - * vertex index inside the vertex shader. - * - * @param count The number of instances to draw - */ - public void drawTriangleList(VertexBuffer indexBuf, Mesh.Mode mode, int count, int vertCount); - - /** - * Clears all vertex attributes set with setVertexAttrib. - */ - public void clearVertexAttribs(); - - /** - * Renders count meshes, with the geometry data supplied. - * The shader which is currently set with setShader is - * responsible for transforming the input verticies into clip space - * and shading it based on the given vertex attributes. - * The int variable gl_InstanceID can be used to access the current - * instance of the mesh being rendered inside the vertex shader. - * - * @param mesh - * @param count - */ - public void renderMesh(Mesh mesh, int count); - -} diff --git a/engine/src/core/com/jme3/renderer/layer/MiscLayer.java b/engine/src/core/com/jme3/renderer/layer/MiscLayer.java deleted file mode 100644 index 878484eab..000000000 --- a/engine/src/core/com/jme3/renderer/layer/MiscLayer.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2009-2010 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * 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. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 THE COPYRIGHT OWNER 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. - */ - -package com.jme3.renderer.layer; - -import com.jme3.renderer.*; -import com.jme3.math.ColorRGBA; -import java.util.Collection; - -/** - * Handles basic renderer functions. - */ -public interface MiscLayer { - - /** - * @return The capabilities of the renderer. - */ - public Collection getCaps(); - - /** - * Clears certain channels of the current bound framebuffer. - * - * @param color True if to clear colors (RGBA) - * @param depth True if to clear depth/z - * @param stencil True if to clear stencil buffer (if available, otherwise - * ignored) - */ - public void clearBuffers(boolean color, boolean depth, boolean stencil); - - /** - * Sets the background (aka clear) color. - * @param color - */ - public void setBackgroundColor(ColorRGBA color); - -} diff --git a/engine/src/core/com/jme3/renderer/layer/ShaderLayer.java b/engine/src/core/com/jme3/renderer/layer/ShaderLayer.java deleted file mode 100644 index 5dcdcfb67..000000000 --- a/engine/src/core/com/jme3/renderer/layer/ShaderLayer.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2009-2010 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * 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. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 THE COPYRIGHT OWNER 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. - */ - -package com.jme3.renderer.layer; - -import com.jme3.shader.Shader; -import com.jme3.shader.Shader.ShaderSource; - -/** - * Renderer layer for handling shaders - */ -public interface ShaderLayer { - - /** - * Updates the shader source, creating an ID and registering - * with the object manager. - * @param source - */ - public void updateShaderSourceData(ShaderSource source); - - /** - * Uploads the shader source code and prepares it for use. - * @param shader - */ - public void updateShaderData(Shader shader); - - /** - * @param shader Sets the shader to use for rendering, uploading it - * if neccessary. - */ - public void setShader(Shader shader); - - /** - * @param shader The shader to delete. This method also deletes - * the attached shader sources. - */ - public void deleteShader(Shader shader); - - /** - * Deletes the provided shader source. - * @param source - */ - public void deleteShaderSource(ShaderSource source); - -} diff --git a/engine/src/core/com/jme3/renderer/layer/TextureLayer.java b/engine/src/core/com/jme3/renderer/layer/TextureLayer.java deleted file mode 100644 index 445461847..000000000 --- a/engine/src/core/com/jme3/renderer/layer/TextureLayer.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2009-2010 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * 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. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 THE COPYRIGHT OWNER 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. - */ - -package com.jme3.renderer.layer; - -import com.jme3.texture.Texture; - -/** - * Renderer layer for handling textures - */ -public interface TextureLayer { - - /** - * Prepares the texture for use and uploads its image data if neceessary. - */ - public void updateTextureData(Texture tex); - - /** - * Sets the texture to use for the given texture unit. - */ - public void setTexture(int unit, Texture tex); - - /** - * Clears all set texture units - * @see #setTexture - */ - public void clearTextureUnits(); - - /** - * Deletes a texture from the GPU. - * @param tex - */ - public void deleteTexture(Texture tex); - -}