* Fixed issue where Nifty GUI would consume all mouse button events

* Made video player deprecated


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7129 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
sha..rd 14 years ago
parent ea1d086648
commit e15b26b0ed
  1. 1
      engine/src/core/com/jme3/app/state/AbstractAppState.java
  2. 7
      engine/src/core/com/jme3/renderer/RenderManager.java
  3. 1
      engine/src/jheora/com/jme3/video/Clock.java
  4. 1
      engine/src/jheora/com/jme3/video/RingBuffer.java
  5. 1
      engine/src/jheora/com/jme3/video/SystemClock.java
  6. 1
      engine/src/jheora/com/jme3/video/TestVideoPlayer.java
  7. 1
      engine/src/jheora/com/jme3/video/VFrame.java
  8. 1
      engine/src/jheora/com/jme3/video/VQueue.java
  9. 1
      engine/src/jheora/com/jme3/video/plugins/jheora/ADecoder.java
  10. 1
      engine/src/jheora/com/jme3/video/plugins/jheora/AVThread.java
  11. 1
      engine/src/jheora/com/jme3/video/plugins/jheora/VDecoder.java
  12. 1
      engine/src/jheora/com/jme3/video/plugins/jheora/YUVConv.java
  13. 7
      engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
  14. 22
      engine/src/test/jme3test/network/sync/ClientBoxEntity.java

@ -80,7 +80,6 @@ public class AbstractAppState implements AppState {
} }
public void postRender(){ public void postRender(){
} }
public void cleanup() { public void cleanup() {

@ -31,13 +31,8 @@
*/ */
package com.jme3.renderer; package com.jme3.renderer;
import com.jme3.light.AmbientLight;
import com.jme3.light.Light;
import com.jme3.light.LightList;
import com.jme3.material.Material; import com.jme3.material.Material;
import com.jme3.material.RenderState; import com.jme3.material.RenderState;
import com.jme3.material.Technique;
import com.jme3.math.ColorRGBA;
import com.jme3.math.Matrix3f; import com.jme3.math.Matrix3f;
import com.jme3.math.Matrix4f; import com.jme3.math.Matrix4f;
import com.jme3.math.Quaternion; import com.jme3.math.Quaternion;
@ -107,7 +102,7 @@ public class RenderManager {
*/ */
public RenderManager(Renderer renderer) { public RenderManager(Renderer renderer) {
this.renderer = renderer; this.renderer = renderer;
this.shader = renderer.getCaps().contains(Caps.GLSL100); //this.shader = renderer.getCaps().contains(Caps.GLSL100);
} }
public ViewPort getPreView(String viewName) { public ViewPort getPreView(String viewName) {

@ -32,6 +32,7 @@
package com.jme3.video; package com.jme3.video;
@Deprecated
public interface Clock { public interface Clock {
public static final long MILLIS_TO_NANOS = 1000000; public static final long MILLIS_TO_NANOS = 1000000;

@ -32,6 +32,7 @@
package com.jme3.video; package com.jme3.video;
@Deprecated
public final class RingBuffer { public final class RingBuffer {
private final int bufSize; private final int bufSize;

@ -32,6 +32,7 @@
package com.jme3.video; package com.jme3.video;
@Deprecated
public class SystemClock implements Clock { public class SystemClock implements Clock {
private long startTime = 0; private long startTime = 0;

@ -42,6 +42,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
@Deprecated
public class TestVideoPlayer extends SimpleApplication { public class TestVideoPlayer extends SimpleApplication {
private Picture picture; private Picture picture;

@ -36,6 +36,7 @@ import com.jme3.texture.Image.Format;
import com.jme3.texture.Texture2D; import com.jme3.texture.Texture2D;
import com.jme3.util.BufferUtils; import com.jme3.util.BufferUtils;
@Deprecated
public class VFrame extends Texture2D { public class VFrame extends Texture2D {
private long time; private long time;

@ -37,6 +37,7 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@Deprecated
public class VQueue extends ArrayBlockingQueue<VFrame> { public class VQueue extends ArrayBlockingQueue<VFrame> {
// private final ArrayList<VFrame> returnedFrames; // private final ArrayList<VFrame> returnedFrames;

@ -43,6 +43,7 @@ import com.jme3.video.RingBuffer;
import com.jme3.video.SystemClock; import com.jme3.video.SystemClock;
import java.io.InputStream; import java.io.InputStream;
@Deprecated
public class ADecoder extends InputStream implements Clock { public class ADecoder extends InputStream implements Clock {
private int packetIndex = 0; private int packetIndex = 0;

@ -47,6 +47,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@Deprecated
public class AVThread implements Runnable { public class AVThread implements Runnable {
private static final Logger logger = Logger.getLogger(AVThread.class.getName()); private static final Logger logger = Logger.getLogger(AVThread.class.getName());

@ -43,6 +43,7 @@ import com.jme3.video.VFrame;
import com.jme3.video.VQueue; import com.jme3.video.VQueue;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@Deprecated
public class VDecoder implements Clock { public class VDecoder implements Clock {
private int packetIndex = 0; private int packetIndex = 0;

@ -34,6 +34,7 @@ package com.jme3.video.plugins.jheora;
import com.fluendo.jheora.YUVBuffer; import com.fluendo.jheora.YUVBuffer;
@Deprecated
public final class YUVConv { public final class YUVConv {
private int[] pixels; private int[] pixels;

@ -124,11 +124,10 @@ public class InputSystemJme implements InputSystem, RawInputListener {
private void onMouseButtonEventQueued(MouseButtonEvent evt, NiftyInputConsumer nic) { private void onMouseButtonEventQueued(MouseButtonEvent evt, NiftyInputConsumer nic) {
buttonIndex = evt.getButtonIndex(); buttonIndex = evt.getButtonIndex();
pressed = evt.isPressed(); pressed = evt.isPressed();
nic.processMouseEvent(x, y, 0, buttonIndex, pressed);
// MouseInputEvent niftyEvt = new MouseInputEvent(x, y, pressed); if (nic.processMouseEvent(x, y, 0, buttonIndex, pressed)){
// if (nic.processMouseEvent(niftyEvt) /*|| nifty.getCurrentScreen().isMouseOverElement()*/){
evt.setConsumed(); evt.setConsumed();
// } }
} }
public void onMouseButtonEvent(MouseButtonEvent evt) { public void onMouseButtonEvent(MouseButtonEvent evt) {

@ -28,28 +28,6 @@ public class ClientBoxEntity extends BoxEntity {
pos.addLocal(vel.mult(latencyDelta)); pos.addLocal(vel.mult(latencyDelta));
} }
private static float interpolateCubic(float v0, float v1, float v2, float v3, float x){
float p = (v3 - v2) - (v0 - v1);
float q = (v0 - v1) - p;
float r = v2 - v0;
float s = v1;
return p * x * x * x
+ q * x * x
+ r * x
+ s;
}
private static Vector3f interpolateCubic(Vector3f v0, Vector3f v1,
Vector3f v2, Vector3f v3,
float x){
Vector3f vec = new Vector3f();
vec.x = interpolateCubic(v0.x, v1.x, v2.x, v3.x, x);
vec.y = interpolateCubic(v0.y, v1.y, v2.y, v3.y, x);
vec.z = interpolateCubic(v0.z, v1.z, v2.z, v3.z, x);
return vec;
}
@Override @Override
public void interpolate(float blendAmount) { public void interpolate(float blendAmount) {
if (pos != null){ if (pos != null){

Loading…
Cancel
Save