From a28c2622d9f7f5dca3a1d0c4bbfceb79e8ebeae8 Mon Sep 17 00:00:00 2001
From: "sha..rd" <shadowislord@gmail.com>
Date: Sun, 8 May 2011 18:21:48 +0000
Subject: [PATCH]  * Revert back to fixed ortho matrix calculation

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7470 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../core/com/jme3/renderer/RenderManager.java | 22 +++---
 .../test/jme3test/texture/TestDdsLoading.java | 68 -------------------
 2 files changed, 10 insertions(+), 80 deletions(-)
 delete mode 100644 engine/src/test/jme3test/texture/TestDdsLoading.java

diff --git a/engine/src/core/com/jme3/renderer/RenderManager.java b/engine/src/core/com/jme3/renderer/RenderManager.java
index 318e672db..0f35fb7a2 100644
--- a/engine/src/core/com/jme3/renderer/RenderManager.java
+++ b/engine/src/core/com/jme3/renderer/RenderManager.java
@@ -611,19 +611,18 @@ public class RenderManager {
             cam.clearViewportChanged();
             prevCam = cam;
 
-            float translateX = viewWidth == viewX ? 0 : -(viewWidth + viewX) / (viewWidth - viewX);
-            float translateY = viewHeight == viewY ? 0 : -(viewHeight + viewY) / (viewHeight - viewY);
-            float scaleX = viewWidth == viewX ? 1f : 2f / (viewWidth - viewX);
-            float scaleY = viewHeight == viewY ? 1f : 2f / (viewHeight - viewY);
+//            float translateX = viewWidth == viewX ? 0 : -(viewWidth + viewX) / (viewWidth - viewX);
+//            float translateY = viewHeight == viewY ? 0 : -(viewHeight + viewY) / (viewHeight - viewY);
+//            float scaleX = viewWidth == viewX ? 1f : 2f / (viewWidth - viewX);
+//            float scaleY = viewHeight == viewY ? 1f : 2f / (viewHeight - viewY);
+//            
+//            orthoMatrix.loadIdentity();
+//            orthoMatrix.setTranslation(translateX, translateY, 0);
+//            orthoMatrix.setScale(scaleX, scaleY, 0); 
             
             orthoMatrix.loadIdentity();
-            orthoMatrix.setTranslation(translateX, translateY, 0);
-            orthoMatrix.setScale(scaleX, scaleY, 0); 
-            
-            //orthoMatrix.loadIdentity();
-            //orthoMatrix.setTranslation(-1f, -1f, 0f);
-            //orthoMatrix.setScale(2f / cam.getWidth(), 2f / cam.getHeight(), 0f);
-            //System.out.println(orthoMatrix);
+            orthoMatrix.setTranslation(-1f, -1f, 0f);
+            orthoMatrix.setScale(2f / cam.getWidth(), 2f / cam.getHeight(), 0f);
         }
     }
 
@@ -639,7 +638,6 @@ public class RenderManager {
                 viewProjMatrix.set(cam.getViewProjectionMatrix());
             }
 
-
             camLoc.set(cam.getLocation());
             cam.getLeft(camLeft);
             cam.getUp(camUp);
diff --git a/engine/src/test/jme3test/texture/TestDdsLoading.java b/engine/src/test/jme3test/texture/TestDdsLoading.java
deleted file mode 100644
index 87755c255..000000000
--- a/engine/src/test/jme3test/texture/TestDdsLoading.java
+++ /dev/null
@@ -1,68 +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 jme3test.texture;
-
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.app.SimpleApplication;
-import com.jme3.material.Material;
-import com.jme3.scene.shape.Quad;
-import com.jme3.texture.Texture;
-
-public class TestDdsLoading extends SimpleApplication {
-
-    public static void main(String[] args){
-        TestDdsLoading app = new TestDdsLoading();
-        app.start();
-    }
-
-    @Override
-    public void simpleInitApp() {
-        // create a simple plane/quad
-        Quad quadMesh = new Quad(1, 1);
-
-        Geometry quad = new Geometry("Textured Quad", quadMesh);
-        Texture tex = assetManager.loadTexture("Textures/Sky/Night/Night_dxt1.dds");
-
-        Material mat = new Material(assetManager, "Common/MatDefs/Misc/SimpleTextured.j3md");
-        mat.setTexture("ColorMap", tex);
-        quad.setMaterial(mat);
-
-        float aspect = tex.getImage().getWidth() / (float) tex.getImage().getHeight();
-        quad.setLocalScale(new Vector3f(aspect * 5, 5, 1));
-        quad.center();
-
-        rootNode.attachChild(quad);
-    }
-
-}