[openwonderland-modules] r2027 committed - contribute to open source

[openwonderl...@googlecode.com]

Revision: 2027
Author: abhishek...@wishtreetech.com
Date: Fri May 30 05:30:57 2014 UTC
Log: contribute to open source
http://code.google.com/p/openwonderland-modules/source/detail?r=2027

Added:
/trunk/0.5/unstable/stereo-view/nbproject/nb.properties
Modified:
/trunk/0.5/unstable/stereo-view/my.module.properties
/trunk/0.5/unstable/stereo-view/nbproject/project.xml

/trunk/0.5/unstable/stereo-view/src/classes/org/jdesktop/wonderland/modules/stereoview/client/StereoViewEntity.java

=======================================
--- /dev/null
+++ /trunk/0.5/unstable/stereo-view/nbproject/nb.properties Fri May 30
05:30:57 2014 UTC
@@ -0,0 +1,5 @@
+
+wonderland.ostype=win64
+wonderland.arch=amd64
+wonderland.system.type=windows-amd64
+
=======================================
--- /trunk/0.5/unstable/stereo-view/my.module.properties Fri May 30
05:00:39 2014 UTC
+++ /trunk/0.5/unstable/stereo-view/my.module.properties Fri May 30
05:30:57 2014 UTC
@@ -22,7 +22,7 @@
# Property: wonderland.dir (required)
# The location of the Wonderland source
#
-wonderland.dir=${current.dir}/../../wonderland
+wonderland.dir=${current.dir}/../../../wonderland

#
# Property: module.plugin.src (optional)
=======================================
--- /trunk/0.5/unstable/stereo-view/nbproject/project.xml Fri May 30
05:00:39 2014 UTC
+++ /trunk/0.5/unstable/stereo-view/nbproject/project.xml Fri May 30
05:30:57 2014 UTC
@@ -88,7 +88,7 @@
<java-data
xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
<compilation-unit>
<package-root>src/classes</package-root>
- <classpath
mode="compile">../../wonderland/core/ext/common/mtgame.jar:../../wonderland/core/build/lib/wonderland-client.jar:../../wonderland/core/build/lib/wonderland-common.jar:../../wonderland/core/ext/jme20/target/jme.jar:../../wonderland/core/ext/common/javolution.jar:../../wonderland/core/ext/macosx/jars/jogl.jar</classpath>
+ <classpath
mode="compile">../../../wonderland/core/ext/common/mtgame.jar;../../../wonderland/core/build/lib/wonderland-client.jar;../../../wonderland/core/build/lib/wonderland-common.jar;../../../wonderland/core/ext/jme20/target/jme.jar;../../../wonderland/core/ext/common/javolution.jar;../../../wonderland/core/ext/win64/jars/jogl.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
=======================================
---
/trunk/0.5/unstable/stereo-view/src/classes/org/jdesktop/wonderland/modules/stereoview/client/StereoViewEntity.java
Fri May 30 05:00:39 2014 UTC
+++
/trunk/0.5/unstable/stereo-view/src/classes/org/jdesktop/wonderland/modules/stereoview/client/StereoViewEntity.java
Fri May 30 05:30:57 2014 UTC
@@ -4,8 +4,6 @@

import com.jme.image.Texture;
import com.jme.image.Texture.Type;
-import com.jme.math.Quaternion;
-import com.jme.math.Vector3f;
import com.jme.scene.CameraNode;
import com.jme.scene.Node;
import com.jme.scene.state.jogl.JOGLTextureState;
@@ -17,18 +15,16 @@
import java.nio.IntBuffer;
import java.util.logging.Logger;
import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
import javax.media.opengl.glu.GLU;
+import org.jdesktop.mtgame.CameraComponent;
import org.jdesktop.mtgame.Entity;
-import org.jdesktop.wonderland.client.jme.ClientContextJME;
-import org.jdesktop.mtgame.CameraComponent;
import org.jdesktop.mtgame.RenderManager;
import org.jdesktop.mtgame.RenderUpdater;
import org.jdesktop.mtgame.TextureRenderBuffer;
-import org.jdesktop.mtgame.processor.WorkProcessor.WorkCommit;
-import org.jdesktop.wonderland.client.jme.SceneWorker;
+import org.jdesktop.wonderland.client.jme.ClientContextJME;
import org.jdesktop.wonderland.client.jme.ViewManager;
import org.jdesktop.wonderland.client.jme.ViewProperties;
-import org.jdesktop.wonderland.common.cell.CellTransform;

/**
*/
@@ -293,7 +289,7 @@
format, dataType, null);

if (t.getMinificationFilter().usesMipMapLevels()) {
- gl.glGenerateMipmapEXT(GL.GL_TEXTURE_2D);
+ gl.glGenerateMipmap(GL.GL_TEXTURE_2D);
}

readBuffer =
BufferUtils.createByteBuffer(getWidth()*getHeight()*4);
@@ -302,10 +298,10 @@

@Override
public ByteBuffer getTextureData() {
- GL gl = GLU.getCurrentGL();
+ GL2 gl = GLU.getCurrentGL().getGL2();

JOGLTextureState.doTextureBind(getTexture().getTextureId(), 0,
Texture.Type.TwoDimensional);
- gl.glGetTexImage(GL.GL_TEXTURE_2D, 0, GL.GL_BGRA,
GL.GL_UNSIGNED_INT_8_8_8_8_REV, readBuffer.asIntBuffer());
+ gl.glGetTexImage(GL.GL_TEXTURE_2D, 0, GL.GL_BGRA,
GL2.GL_UNSIGNED_INT_8_8_8_8_REV, readBuffer.asIntBuffer());

//System.out.println("GetErroe: " + gl.glGetError());
return (readBuffer);