From ea09c75e203f74a41d0fcc7ee8e9093c295cc979 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 9 Apr 2024 10:13:38 +0300 Subject: [PATCH 1/2] cleanup the strange code These places should be optimised --- .../src/main/java/com/jme3/input/FlyByCamera.java | 2 +- .../java/com/jme3/renderer/opengl/GLRenderer.java | 2 -- jme3-core/src/main/java/com/jme3/util/ListSort.java | 3 --- .../java/com/jme3/export/binary/BinaryExporter.java | 4 ++-- .../java/com/jme3/texture/plugins/HDRLoader.java | 12 ------------ .../collision/shapes/GImpactCollisionShape.java | 1 - .../bullet/collision/shapes/MeshCollisionShape.java | 1 - .../java/com/jme3/network/base/DefaultServer.java | 6 +----- .../message/SerializerRegistrationsMessage.java | 2 -- .../jme3/scene/plugins/fbx/material/FbxTexture.java | 9 --------- .../vr/lwjgl_openvr/LWJGLOpenVRViewManager.java | 10 ++++------ .../com/jme3/input/vr/oculus/OculusViewManager.java | 10 ++++------ 12 files changed, 12 insertions(+), 50 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/input/FlyByCamera.java b/jme3-core/src/main/java/com/jme3/input/FlyByCamera.java index 2f875bc98d..340dc1f145 100644 --- a/jme3-core/src/main/java/com/jme3/input/FlyByCamera.java +++ b/jme3-core/src/main/java/com/jme3/input/FlyByCamera.java @@ -198,7 +198,7 @@ public float getZoomSpeed() { */ public void setEnabled(boolean enable){ if (enabled && !enable){ - if (inputManager!= null && (!dragToRotate || (dragToRotate && canRotate))){ + if (inputManager != null && (!dragToRotate || canRotate)){ inputManager.setCursorVisible(true); } } diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java index 60e6b30265..15a3def2a6 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java @@ -1309,8 +1309,6 @@ private boolean isValidNumber(Vector4f c) { } protected void updateUniform(Shader shader, Uniform uniform) { - int shaderId = shader.getId(); - assert uniform.getName() != null; assert shader.getId() > 0; diff --git a/jme3-core/src/main/java/com/jme3/util/ListSort.java b/jme3-core/src/main/java/com/jme3/util/ListSort.java index 2ed5f9af76..4e3fddd797 100644 --- a/jme3-core/src/main/java/com/jme3/util/ListSort.java +++ b/jme3-core/src/main/java/com/jme3/util/ListSort.java @@ -874,9 +874,6 @@ public void innerMergeHigh(Comparator comp, T[] tempArray, T[] arr, int idxA) if (lengthA == 0 || lengthB == 1) { return; } - if (lengthB == 1) { - return; - } while (true) { // Number of wins by run A int aWins = 0; diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java index 7b6c6ca79e..ed6671e6ef 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java @@ -361,10 +361,10 @@ public int processBinarySavable(Savable object) throws IOException { return -1; } Class clazz = object.getClass(); - BinaryClassObject bco = classes.get(object.getClass().getName()); + BinaryClassObject bco = classes.get(clazz.getName()); // is this class been looked at before? in tagTable? if (bco == null) { - bco = createClassObject(object.getClass()); + bco = createClassObject(clazz); } // is object in contentTable? diff --git a/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java b/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java index 183049f9ec..aa9ff394f6 100644 --- a/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java @@ -101,18 +101,6 @@ public static void convertRGBEtoFloat2(byte[] rgbe, float[] rgbf){ rgbf[2] = (B / 256.0f) * e; } - public static void convertRGBEtoFloat3(byte[] rgbe, float[] rgbf){ - int R = rgbe[0] & 0xFF, - G = rgbe[1] & 0xFF, - B = rgbe[2] & 0xFF, - E = rgbe[3] & 0xFF; - - float e = (float) Math.pow(2f, E - (128 + 8) ); - rgbf[0] = R * e; - rgbf[1] = G * e; - rgbf[2] = B * e; - } - private void writeRGBE(byte[] rgbe){ if (writeRGBE){ dataStore.put(rgbe); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java index 7dadd68835..7f07967b6c 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java @@ -123,7 +123,6 @@ protected void createShape() { bulletMesh.numTriangles = numTriangles; bulletMesh.vertexStride = vertexStride; bulletMesh.triangleIndexStride = triangleIndexStride; - bulletMesh.triangleIndexBase = triangleIndexBase; bulletMesh.vertexBase = vertexBase; bulletMesh.triangleIndexBase = triangleIndexBase; TriangleIndexVertexArray tiv = new TriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java index acb93ee043..db593bd361 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java @@ -131,7 +131,6 @@ protected void createShape() { bulletMesh.numTriangles = numTriangles; bulletMesh.vertexStride = vertexStride; bulletMesh.triangleIndexStride = triangleIndexStride; - bulletMesh.triangleIndexBase = triangleIndexBase; bulletMesh.vertexBase = vertexBase; bulletMesh.triangleIndexBase = triangleIndexBase; TriangleIndexVertexArray tiv = new TriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride); diff --git a/jme3-networking/src/main/java/com/jme3/network/base/DefaultServer.java b/jme3-networking/src/main/java/com/jme3/network/base/DefaultServer.java index 1364e2b179..c88a91839e 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/DefaultServer.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/DefaultServer.java @@ -476,11 +476,7 @@ protected void removeConnecting( Endpoint p ) protected void connectionClosed( Endpoint p ) { - if( p.isConnected() ) { - log.log( Level.FINE, "Connection closed:{0}.", p ); - } else { - log.log( Level.FINE, "Connection closed:{0}.", p ); - } + log.log( Level.FINE, "Connection closed:{0}.", p ); // Try to find the endpoint in all ways that it might // exist. Note: by this point the raw network channel is diff --git a/jme3-networking/src/main/java/com/jme3/network/message/SerializerRegistrationsMessage.java b/jme3-networking/src/main/java/com/jme3/network/message/SerializerRegistrationsMessage.java index 331c7ab096..90e18a7931 100644 --- a/jme3-networking/src/main/java/com/jme3/network/message/SerializerRegistrationsMessage.java +++ b/jme3-networking/src/main/java/com/jme3/network/message/SerializerRegistrationsMessage.java @@ -75,13 +75,11 @@ public class SerializerRegistrationsMessage extends AbstractMessage { // their JME versions are out of date. ignore.add(Boolean.class); ignore.add(Float.class); - ignore.add(Boolean.class); ignore.add(Byte.class); ignore.add(Character.class); ignore.add(Short.class); ignore.add(Integer.class); ignore.add(Long.class); - ignore.add(Float.class); ignore.add(Double.class); ignore.add(String.class); diff --git a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/material/FbxTexture.java b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/material/FbxTexture.java index cb1cdd0d9e..ccd3b4846f 100644 --- a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/material/FbxTexture.java +++ b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/material/FbxTexture.java @@ -96,15 +96,6 @@ protected Texture toJmeObject() { public void fromElement(FbxElement element) { super.fromElement(element); if (getSubclassName().equals("")) { - for (FbxElement e : element.children) { - if (e.id.equals("Type")) { - e.properties.get(0); - } - /*else if (e.id.equals("FileName")) { - filename = (String) e.properties.get(0); - }*/ - } - for (FbxElement prop : element.getFbxProperties()) { String propName = (String) prop.properties.get(0); if (propName.equals("AlphaSource")) { diff --git a/jme3-vr/src/main/java/com/jme3/input/vr/lwjgl_openvr/LWJGLOpenVRViewManager.java b/jme3-vr/src/main/java/com/jme3/input/vr/lwjgl_openvr/LWJGLOpenVRViewManager.java index 2b658e53f4..e1eb7cc877 100644 --- a/jme3-vr/src/main/java/com/jme3/input/vr/lwjgl_openvr/LWJGLOpenVRViewManager.java +++ b/jme3-vr/src/main/java/com/jme3/input/vr/lwjgl_openvr/LWJGLOpenVRViewManager.java @@ -145,12 +145,10 @@ public void render() { dev.updatePose(); dev.getPositionAndOrientation(hmdPos, hmdRot); - if (obs != null) { - // update hmdPos based on obs rotation - finalRotation.set(objRot); - finalRotation.mult(hmdPos, hmdPos); - finalRotation.multLocal(hmdRot); - } + // update hmdPos based on obs rotation + finalRotation.set(objRot); + finalRotation.mult(hmdPos, hmdPos); + finalRotation.multLocal(hmdRot); finalizeCamera(dev.getHMDVectorPoseLeftEye(), objPos, getLeftCamera()); finalizeCamera(dev.getHMDVectorPoseRightEye(), objPos, getRightCamera()); diff --git a/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusViewManager.java b/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusViewManager.java index 6ebbab1cf9..68a1a876ff 100644 --- a/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusViewManager.java +++ b/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusViewManager.java @@ -128,12 +128,10 @@ public void update(float tpf) { // update the HMD's position & orientation hardware.getPositionAndOrientation(hmdPos, hmdRot); - if (obs != null) { - // update hmdPos based on obs rotation - finalRotation.set(objRot); - finalRotation.mult(hmdPos, hmdPos); - finalRotation.multLocal(hmdRot); - } + // update hmdPos based on obs rotation + finalRotation.set(objRot); + finalRotation.mult(hmdPos, hmdPos); + finalRotation.multLocal(hmdRot); // Update both eye cameras finalizeCamera(hardware.getHMDVectorPoseLeftEye(), objPos, leftCamera); From 0b0b942248a68c82359719b63f8c1ca6d2a12eef Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 9 Apr 2024 10:24:40 +0300 Subject: [PATCH 2/2] fix IndexOutOfBoundsException --- .../fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java index 9cc40fe5b9..1df2d47840 100644 --- a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java +++ b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java @@ -332,8 +332,8 @@ private List createGeometries() throws IOException { indexMap = new ArrayList<>(vCount); reverseVertexMap = new ArrayList<>(vCount); for(int i = 0; i < vCount; ++i) { - vertexMap.set(i, i); - indexMap.set(i, i); + vertexMap.add(i, i); + indexMap.add(i, i); List l = new ArrayList<>(1); l.add(i); reverseVertexMap.add(l);