OSDN Git Service

[renamed] calculateVIewport to calculateGLViewport
authorbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Sun, 12 Dec 2010 20:04:21 +0000 (20:04 +0000)
committerbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Sun, 12 Dec 2010 20:04:21 +0000 (20:04 +0000)
tests/gdx-tests/src/com/badlogic/gdx/tests/OrthoCamBorderTest.java

index c6cdddd..6dff85c 100644 (file)
@@ -29,7 +29,7 @@ public class OrthoCamBorderTest extends GdxTest {
        static final int WIDTH = 480;\r
        static final int HEIGHT = 320;  \r
        OrthographicCamera cam;\r
-       Rectangle viewport;\r
+       Rectangle glViewport;\r
        Mesh mesh;\r
        \r
        public void create() {\r
@@ -45,10 +45,10 @@ public class OrthoCamBorderTest extends GdxTest {
                cam.setViewport(WIDTH, HEIGHT);\r
                cam.getPosition().set(WIDTH / 2, HEIGHT / 2, 0);\r
                \r
-               viewport = calculateViewport(WIDTH, HEIGHT);\r
+               glViewport = calculateGLViewport(WIDTH, HEIGHT);\r
        }\r
        \r
-       private Rectangle calculateViewport(int desiredWidth, int desiredHeight) {\r
+       private Rectangle calculateGLViewport(int desiredWidth, int desiredHeight) {\r
                Rectangle viewport = new Rectangle();\r
                if(Gdx.graphics.getWidth() > Gdx.graphics.getHeight()) {\r
                        float aspect = (float)Gdx.graphics.getHeight() / HEIGHT;\r
@@ -67,13 +67,13 @@ public class OrthoCamBorderTest extends GdxTest {
        }       \r
        \r
        public void resize(int width, int height) {\r
-               viewport = calculateViewport(WIDTH, HEIGHT);\r
+               glViewport = calculateGLViewport(WIDTH, HEIGHT);\r
        }\r
        \r
        public void render() {\r
                GL10 gl = Gdx.gl10;\r
                gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
-               gl.glViewport((int)viewport.x, (int)viewport.y, (int)viewport.width, (int)viewport.height);\r
+               gl.glViewport((int)glViewport.x, (int)glViewport.y, (int)glViewport.width, (int)glViewport.height);\r
                \r
                cam.setMatrices();\r
                mesh.render(GL10.GL_TRIANGLES);\r