Reverted some more light code which should not be in this branch.

experimental
Daniel Johansson 10 years ago
parent b68035570d
commit dd6356eff1
  1. 6
      jme3-core/src/main/java/com/jme3/light/AmbientLight.java
  2. 12
      jme3-core/src/main/java/com/jme3/light/DirectionalLight.java

@ -45,7 +45,7 @@ import com.jme3.util.TempVars;
* regardless of the model's location. The material's ambient color is * regardless of the model's location. The material's ambient color is
* multiplied by the ambient light color to get the final ambient color of * multiplied by the ambient light color to get the final ambient color of
* an object. * an object.
* *
* @author Kirill Vainer * @author Kirill Vainer
*/ */
public class AmbientLight extends Light { public class AmbientLight extends Light {
@ -61,12 +61,12 @@ public class AmbientLight extends Light {
public boolean intersectsBox(BoundingBox box, TempVars vars) { public boolean intersectsBox(BoundingBox box, TempVars vars) {
return true; return true;
} }
@Override @Override
public boolean intersectsFrustum(Camera camera, TempVars vars) { public boolean intersectsFrustum(Camera camera, TempVars vars) {
return true; return true;
} }
@Override @Override
public void computeLastDistance(Spatial owner) { public void computeLastDistance(Spatial owner) {
} }

@ -85,10 +85,10 @@ public class DirectionalLight extends Light {
/** /**
* Returns the direction vector of the light. * Returns the direction vector of the light.
* *
* @return The direction vector of the light. * @return The direction vector of the light.
* *
* @see DirectionalLight#setDirection(com.jme3.math.Vector3f) * @see DirectionalLight#setDirection(com.jme3.math.Vector3f)
*/ */
public Vector3f getDirection() { public Vector3f getDirection() {
return direction; return direction;
@ -99,7 +99,7 @@ public class DirectionalLight extends Light {
* <p> * <p>
* Represents the direction the light is shining. * Represents the direction the light is shining.
* (1, 0, 0) would represent light shining in the +X direction. * (1, 0, 0) would represent light shining in the +X direction.
* *
* @param dir the direction of the light. * @param dir the direction of the light.
*/ */
public final void setDirection(Vector3f dir){ public final void setDirection(Vector3f dir){
@ -113,12 +113,12 @@ public class DirectionalLight extends Light {
public boolean intersectsBox(BoundingBox box, TempVars vars) { public boolean intersectsBox(BoundingBox box, TempVars vars) {
return true; return true;
} }
@Override @Override
public boolean intersectsFrustum(Camera camera, TempVars vars) { public boolean intersectsFrustum(Camera camera, TempVars vars) {
return true; return true;
} }
@Override @Override
public Type getType() { public Type getType() {
return Type.Directional; return Type.Directional;

Loading…
Cancel
Save