sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Removed evil code

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7846 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-07-09 20:08:22 +00:00
parent a24becee32
commit 80ac165e67
4 changed files with 364 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/nbproject/project.properties
View File

@ -86,7 +86,7 @@ platform.active=default_platform
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
run.jvmargs=-Xbatch -XX:CICompilerCount=1 run.jvmargs=-Xms30m -Xmx30m -XX:MaxDirectMemorySize=256M
run.test.classpath=\ run.test.classpath=\
${javac.test.classpath}:\ ${javac.test.classpath}:\
${build.test.classes.dir} ${build.test.classes.dir}

2
engine/src/core-data/Common/MatDefs/Misc/Sky.frag
View File

@ -1,6 +1,6 @@
#import "Common/ShaderLib/Optics.glsllib" #import "Common/ShaderLib/Optics.glsllib"
uniform ENVMAP m_Texture2; uniform ENVMAP m_Texture;
varying vec3 direction; varying vec3 direction;

1
engine/src/core/com/jme3/light/PointLight.java
View File

@ -61,7 +61,6 @@ public class PointLight extends Light {
if (owner.getWorldBound() != null){ if (owner.getWorldBound() != null){
BoundingVolume bv = owner.getWorldBound(); BoundingVolume bv = owner.getWorldBound();
lastDistance = bv.distanceSquaredTo(position); lastDistance = bv.distanceSquaredTo(position);
System.out.println(lastDistance + ", " + owner);
}else{ }else{
lastDistance = owner.getWorldTranslation().distanceSquared(position); lastDistance = owner.getWorldTranslation().distanceSquared(position);
} }

19
engine/src/core/com/jme3/util/TempVars.java
View File

@ -83,13 +83,6 @@ public class TempVars {
} }
}; };
private static final ThreadLocal<TempVars> tempVars = new ThreadLocal<TempVars>(){
@Override
public TempVars initialValue() {
return new TempVars();
}
};
/** /**
* This instance of TempVars has been retrieved but not released yet. * This instance of TempVars has been retrieved but not released yet.
*/ */
@ -98,13 +91,6 @@ public class TempVars {
private TempVars() { private TempVars() {
} }
public static TempVars get(){
return tempVars.get();
}
public void release(){
}
/** /**
* Acquire an instance of the TempVar class. * Acquire an instance of the TempVar class.
* You have to release the instance after use by calling the * You have to release the instance after use by calling the
@ -114,7 +100,6 @@ public class TempVars {
* *
* @return A TempVar instance * @return A TempVar instance
*/ */
/*
public static TempVars get() { public static TempVars get() {
TempVarsStack stack = varsLocal.get(); TempVarsStack stack = varsLocal.get();
@ -134,7 +119,6 @@ public class TempVars {
return instance; return instance;
} }
*/
/** /**
* Releases this instance of TempVars. * Releases this instance of TempVars.
@ -143,7 +127,6 @@ public class TempVars {
* e.g. Acquiring vars1, then acquiring vars2, vars2 MUST be released * e.g. Acquiring vars1, then acquiring vars2, vars2 MUST be released
* first otherwise an exception will be thrown. * first otherwise an exception will be thrown.
*/ */
/*
public void release() { public void release() {
if (!isUsed){ if (!isUsed){
throw new IllegalStateException("This instance of TempVars was already released!"); throw new IllegalStateException("This instance of TempVars was already released!");
@ -160,7 +143,7 @@ public class TempVars {
if (stack.tempVars[stack.index] != this){ if (stack.tempVars[stack.index] != this){
throw new IllegalStateException("An instance of TempVars has not been released in a called method!"); throw new IllegalStateException("An instance of TempVars has not been released in a called method!");
} }
}*/ }
/** /**
* For interfacing with OpenGL in Renderer. * For interfacing with OpenGL in Renderer.