浏览代码

delete unused private methods

Stephen Gold 4 年之前
父节点
当前提交
e31a9bade5
共有 19 个文件被更改,包括 6 次插入491 次删除
  1. 1 15
      jme3-core/src/main/java/com/jme3/animation/PoseTrack.java
  2. 1 9
      jme3-core/src/main/java/com/jme3/font/BitmapText.java
  3. 0 27
      jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
  4. 1 38
      jme3-core/src/main/java/com/jme3/renderer/queue/TransparentComparator.java
  5. 0 21
      jme3-core/src/main/java/com/jme3/scene/instancing/InstancedGeometry.java
  6. 0 21
      jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java
  7. 1 5
      jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java
  8. 1 5
      jme3-core/src/test/java/com/jme3/material/MaterialTest.java
  9. 1 4
      jme3-core/src/test/java/com/jme3/material/plugins/LoadJ3mdTest.java
  10. 0 56
      jme3-core/src/tools/java/jme3tools/optimize/LodGenerator.java
  11. 0 13
      jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java
  12. 0 26
      jme3-examples/src/main/java/jme3test/model/anim/TestArmature.java
  13. 0 89
      jme3-examples/src/main/java/jme3test/terrain/TerrainTestModifyHeight.java
  14. 0 41
      jme3-examples/src/main/java/jme3test/terrain/TerrainTestReadWrite.java
  15. 0 22
      jme3-examples/src/main/java/jme3test/texture/TestImageRaster.java
  16. 0 55
      jme3-examples/src/main/java/jme3test/water/TestPostWater.java
  17. 0 4
      jme3-jogg/src/main/java/com/jme3/audio/plugins/CachedOggStream.java
  18. 0 9
      jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/FbxLoader.java
  19. 0 31
      jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/material/FbxMaterialProperties.java

+ 1 - 15
jme3-core/src/main/java/com/jme3/animation/PoseTrack.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2020 jMonkeyEngine
+ * Copyright (c) 2009-2021 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -120,20 +120,6 @@ public final class PoseTrack implements Track {
     {
     }
     
-    private void applyFrame(Mesh target, int frameIndex, float weight){
-        PoseFrame frame = frames[frameIndex];
-        VertexBuffer pb = target.getBuffer(Type.Position);
-        for (int i = 0; i < frame.poses.length; i++){
-            Pose pose = frame.poses[i];
-            float poseWeight = frame.weights[i] * weight;
-
-            pose.apply(poseWeight, (FloatBuffer) pb.getData());
-        }
-
-        // force to re-upload data to gpu
-        pb.updateData(pb.getData());
-    }
-
     @Override
     public void setTime(float time, float weight, AnimControl control, AnimChannel channel, TempVars vars) {
         // TODO: When MeshControl is created, it will gather targets

+ 1 - 9
jme3-core/src/main/java/com/jme3/font/BitmapText.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012 jMonkeyEngine
+ * Copyright (c) 2009-2021 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -431,14 +431,6 @@ public class BitmapText extends Node {
         needRefresh = false;
     }
 
-    private ColorRGBA getColor( Material mat, String name ) {
-        MatParam mp = mat.getParam(name);
-        if( mp == null ) {
-            return null;
-        }
-        return (ColorRGBA)mp.getValue();
-    }
-
     public void render(RenderManager rm, ColorRGBA color) {
         for (BitmapTextPage page : textPages) {
             Material mat = page.getMaterial();

+ 0 - 27
jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java

@@ -3123,33 +3123,6 @@ public final class GLRenderer implements Renderer {
         }
     }
 
-    private void renderMeshVertexArray(Mesh mesh, int lod, int count, VertexBuffer instanceData) {
-        if (mesh.getId() == -1) {
-            updateVertexArray(mesh, instanceData);
-        } else {
-            // TODO: Check if it was updated
-        }
-
-        if (context.boundVertexArray != mesh.getId()) {
-            gl3.glBindVertexArray(mesh.getId());
-            context.boundVertexArray = mesh.getId();
-        }
-
-//        IntMap<VertexBuffer> buffers = mesh.getBuffers();
-        VertexBuffer indices;
-        if (mesh.getNumLodLevels() > 0) {
-            indices = mesh.getLodLevel(lod);
-        } else {
-            indices = mesh.getBuffer(Type.Index);
-        }
-        if (indices != null) {
-            drawTriangleList(indices, mesh, count);
-        } else {
-            drawTriangleArray(mesh.getMode(), count, mesh.getVertexCount());
-        }
-        clearVertexAttribs();
-    }
-
     private void renderMeshDefault(Mesh mesh, int lod, int count, VertexBuffer[] instanceData) {
 
         // Here while count is still passed in.  Can be removed when/if

+ 1 - 38
jme3-core/src/main/java/com/jme3/renderer/queue/TransparentComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2020 jMonkeyEngine
+ * Copyright (c) 2009-2021 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,43 +45,6 @@ public class TransparentComparator implements GeometryComparator {
         this.cam = cam;
     }
 
-    /**
-     * Calculates the distance from a spatial to the camera. Distance is a
-     * squared distance.
-     *
-     * @param spat
-     *            Spatial to distancize.
-     * @return Distance from Spatial to camera.
-     */
-    private float distanceToCam2(Geometry spat){
-        if (spat == null)
-            return Float.NEGATIVE_INFINITY;
-
-        if (spat.queueDistance != Float.NEGATIVE_INFINITY)
-            return spat.queueDistance;
-
-        Vector3f camPosition = cam.getLocation();
-        Vector3f viewVector = cam.getDirection();
-        Vector3f spatPosition = null;
-
-        if (spat.getWorldBound() != null){
-            spatPosition = spat.getWorldBound().getCenter();
-        }else{
-            spatPosition = spat.getWorldTranslation();
-        }
-
-        spatPosition.subtract(camPosition, tempVec);
-        spat.queueDistance = tempVec.dot(tempVec);
-
-        float retval = Math.abs(tempVec.dot(viewVector)
-                / viewVector.dot(viewVector));
-        viewVector.mult(retval, tempVec);
-
-        spat.queueDistance = tempVec.length();
-
-        return spat.queueDistance;
-    }
-
     private float distanceToCam(Geometry spat){
         // NOTE: It is best to check the distance
         // to the bound's closest edge vs. the bound's center here.

+ 0 - 21
jme3-core/src/main/java/com/jme3/scene/instancing/InstancedGeometry.java

@@ -251,27 +251,6 @@ public class InstancedGeometry extends Geometry {
         }
     }
 
-    private void sanitize(boolean insideEntriesNonNull) {
-        if (firstUnusedIndex >= geometries.length) {
-            throw new AssertionError();
-        }
-        for (int i = 0; i < geometries.length; i++) {
-            if (i < firstUnusedIndex) {
-                if (geometries[i] == null) {
-                    if (insideEntriesNonNull) {
-                        throw new AssertionError();
-                    }
-                } else if (InstancedNode.getGeometryStartIndex2(geometries[i]) != i) {
-                    throw new AssertionError();
-                }
-            } else {
-                if (geometries[i] != null) {
-                    throw new AssertionError();
-                }
-            }
-        }
-    }
-
     public void updateInstances() {
         FloatBuffer fb = (FloatBuffer) transformInstanceData.getData();
         fb.limit(fb.capacity());

+ 0 - 21
jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java

@@ -124,27 +124,6 @@ public class GLSLLoader implements AssetLoader {
         return node;
     }
 
-    private ShaderDependencyNode nextIndependentNode() throws IOException {
-        Collection<ShaderDependencyNode> allNodes = dependCache.values();
-
-        if (allNodes.isEmpty()) {
-            return null;
-        }
-
-        for (ShaderDependencyNode node : allNodes) {
-            if (node.getDependOnMe().isEmpty()) {
-                return node;
-            }
-        }
-
-        // Circular dependency found..
-        for (ShaderDependencyNode node : allNodes){
-            System.out.println(node.getName());
-        }
-
-        throw new IOException("Circular dependency.");
-    }
-
     private String resolveDependencies(ShaderDependencyNode node, Set<ShaderDependencyNode> alreadyInjectedSet, StringBuilder extensions, boolean injectDependencies) {
         if (alreadyInjectedSet.contains(node)) {
             return "// " + node.getName() + " was already injected at the top.\n";

+ 1 - 5
jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2020 jMonkeyEngine
+ * Copyright (c) 2009-2021 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -113,10 +113,6 @@ public class HDRLoader implements AssetLoader {
         rgbf[2] = B * e;
     }
 
-    private short flip(int in){
-        return (short) ((in << 8 & 0xFF00) | (in >> 8));
-    }
-    
     private void writeRGBE(byte[] rgbe){
         if (writeRGBE){
             dataStore.put(rgbe);

+ 1 - 5
jme3-core/src/test/java/com/jme3/material/MaterialTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2016 jMonkeyEngine
+ * Copyright (c) 2009-2021 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -188,10 +188,6 @@ public class MaterialTest {
         }
     }
 
-    private void caps(Caps... caps) {
-        myCaps.addAll(Arrays.asList(caps));
-    }
-
     private void material(String path) {
         AssetManager assetManager = TestUtil.createAssetManager();
         material = new Material(assetManager, path);

+ 1 - 4
jme3-core/src/test/java/com/jme3/material/plugins/LoadJ3mdTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2018 jMonkeyEngine
+ * Copyright (c) 2009-2021 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -103,9 +103,6 @@ public class LoadJ3mdTest {
                 break;
         }
     }
-    private void caps(Caps... caps) {
-        myCaps.addAll(Arrays.asList(caps));
-    }
 
     private void material(String path) {
         AssetManager assetManager = TestUtil.createAssetManager();

+ 0 - 56
jme3-core/src/tools/java/jme3tools/optimize/LodGenerator.java

@@ -381,18 +381,6 @@ public class LodGenerator {
 //        assert (checkCosts());
     }
 
-    //Debug only
-    private boolean checkCosts() {
-        for (Vertex vertex : vertexList) {
-            boolean test = find(collapseCostSet, vertex);
-            if (!test) {
-                System.out.println("vertex " + vertex.index + " not present in collapse costs");
-                return false;
-            }
-        }
-        return true;
-    }
-    
     private void computeVertexCollapseCost(Vertex vertex) {
         
         vertex.collapseCost = UNINITIALIZED_COLLAPSE_COST;
@@ -998,48 +986,4 @@ public class LodGenerator {
         }
         return true;
     }
-    
-    private boolean assertValidMesh() {
-        // Allows to find bugs in collapsing.
-        for (Vertex vertex : collapseCostSet) {
-            assertValidVertex(vertex);
-        }
-        return true;
-        
-    }
-    
-    private boolean assertValidVertex(Vertex v) {
-        // Allows to find bugs in collapsing.
-        //       System.out.println("Asserting " + v.index);
-        for (Triangle t : v.triangles) {
-            for (int i = 0; i < 3; i++) {
-                //             System.out.println("check " + t.vertex[i].index);
-
-                //assert (collapseCostSet.contains(t.vertex[i]));
-                assert (find(collapseCostSet, t.vertex[i]));
-                
-                assert (t.vertex[i].edges.contains(new Edge(t.vertex[i].collapseTo)));
-                for (int n = 0; n < 3; n++) {
-                    if (i != n) {
-                        
-                        int id = t.vertex[i].edges.indexOf(new Edge(t.vertex[n]));
-                        Edge ed = t.vertex[i].edges.get(id);
-                        //assert (ed.collapseCost != UNINITIALIZED_COLLAPSE_COST);
-                    } else {
-                        assert (!t.vertex[i].edges.contains(new Edge(t.vertex[n])));
-                    }
-                }
-            }
-        }
-        return true;
-    }
-    
-    private boolean find(List<Vertex> set, Vertex v) {
-        for (Vertex vertex : set) {
-            if (v == vertex) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

+ 0 - 13
jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java

@@ -390,19 +390,6 @@ public final class NativeLibraryLoader {
         }
     }
     
-    private static String mapLibraryName_emulated(String name, Platform platform) {
-        switch (platform) {
-            case MacOSX32:
-            case MacOSX64:
-                return name + ".dylib";
-            case Windows32:
-            case Windows64:
-                return name + ".dll";
-            default:
-                return name + ".so";
-        }
-    }
-    
     /**
      * Removes platform-specific portions of a library file name so
      * that it can be accepted by {@link System#loadLibrary(java.lang.String) }.

+ 0 - 26
jme3-examples/src/main/java/jme3test/model/anim/TestArmature.java

@@ -171,32 +171,6 @@ public class TestArmature extends SimpleApplication {
         }, "bind");
     }
 
-
-    private void displayNormals(Spatial s) {
-        final Node debugTangents = new Node("debug tangents");
-        debugTangents.setCullHint(Spatial.CullHint.Never);
-
-        rootNode.attachChild(debugTangents);
-
-        final Material debugMat = assetManager.loadMaterial("Common/Materials/VertexColor.j3m");
-        debugMat.getAdditionalRenderState().setLineWidth(2);
-
-        s.depthFirstTraversal(new SceneGraphVisitorAdapter() {
-            @Override
-            public void visit(Geometry g) {
-                Mesh m = g.getMesh();
-                Geometry debug = new Geometry(
-                        "debug tangents geom",
-                        TangentBinormalGenerator.genNormalLines(m, 0.1f)
-                );
-                debug.setMaterial(debugMat);
-                debug.setCullHint(Spatial.CullHint.Never);
-                debug.setLocalTransform(g.getWorldTransform());
-                debugTangents.attachChild(debug);
-            }
-        });
-    }
-
     private Mesh createMesh() {
         Cylinder c = new Cylinder(30, 16, 0.1f, 1, true);
 

+ 0 - 89
jme3-examples/src/main/java/jme3test/terrain/TerrainTestModifyHeight.java

@@ -325,95 +325,6 @@ public class TerrainTestModifyHeight extends SimpleApplication {
         rootNode.attachChild(terrain);
     }
 
-    private void createTerrainGrid() {
-        
-        // TERRAIN TEXTURE material
-        matTerrain = new Material(this.assetManager, "Common/MatDefs/Terrain/HeightBasedTerrain.j3md");
-
-        // Parameters to material:
-        // regionXColorMap: X = 1..4 the texture that should be appliad to state X
-        // regionX: a Vector3f containing the following information:
-        //      regionX.x: the start height of the region
-        //      regionX.y: the end height of the region
-        //      regionX.z: the texture scale for the region
-        //  it might not be the most elegant way for storing these 3 values, but it packs the data nicely :)
-        // slopeColorMap: the texture to be used for cliffs, and steep mountain sites
-        // slopeTileFactor: the texture scale for slopes
-        // terrainSize: the total size of the terrain (used for scaling the texture)
-        // GRASS texture
-        Texture grass = assetManager.loadTexture("Textures/Terrain/splat/grass.jpg");
-        grass.setWrap(WrapMode.Repeat);
-        matTerrain.setTexture("region1ColorMap", grass);
-        matTerrain.setVector3("region1", new Vector3f(88, 200, this.grassScale));
-
-        // DIRT texture
-        Texture dirt = assetManager.loadTexture("Textures/Terrain/splat/dirt.jpg");
-        dirt.setWrap(WrapMode.Repeat);
-        matTerrain.setTexture("region2ColorMap", dirt);
-        matTerrain.setVector3("region2", new Vector3f(0, 90, this.dirtScale));
-
-        // ROCK texture
-        Texture rock = assetManager.loadTexture("Textures/Terrain/Rock2/rock.jpg");
-        rock.setWrap(WrapMode.Repeat);
-        matTerrain.setTexture("region3ColorMap", rock);
-        matTerrain.setVector3("region3", new Vector3f(198, 260, this.rockScale));
-
-        matTerrain.setTexture("region4ColorMap", rock);
-        matTerrain.setVector3("region4", new Vector3f(198, 260, this.rockScale));
-
-        matTerrain.setTexture("slopeColorMap", rock);
-        matTerrain.setFloat("slopeTileFactor", 32);
-
-        matTerrain.setFloat("terrainSize", 513);
-
-        FractalSum base = new FractalSum();
-        base.setRoughness(0.7f);
-        base.setFrequency(1.0f);
-        base.setAmplitude(1.0f);
-        base.setLacunarity(2.12f);
-        base.setOctaves(8);
-        base.setScale(0.02125f);
-        base.addModulator(new NoiseModulator() {
-            @Override
-            public float value(float... in) {
-                return ShaderUtils.clamp(in[0] * 0.5f + 0.5f, 0, 1);
-            }
-        });
-
-        FilteredBasis ground = new FilteredBasis(base);
-
-        PerturbFilter perturb = new PerturbFilter();
-        perturb.setMagnitude(0.119f);
-
-        OptimizedErode therm = new OptimizedErode();
-        therm.setRadius(5);
-        therm.setTalus(0.011f);
-
-        SmoothFilter smooth = new SmoothFilter();
-        smooth.setRadius(1);
-        smooth.setEffect(0.7f);
-
-        IterativeFilter iterate = new IterativeFilter();
-        iterate.addPreFilter(perturb);
-        iterate.addPostFilter(smooth);
-        iterate.setFilter(therm);
-        iterate.setIterations(1);
-
-        ground.addPreFilter(iterate);
-
-        this.terrain = new TerrainGrid("terrain", 65, 257, new FractalTileLoader(ground, 256f));
-
-
-        terrain.setMaterial(matTerrain);
-        terrain.setLocalTranslation(0, 0, 0);
-        terrain.setLocalScale(2f, 1f, 2f);
-        
-        rootNode.attachChild(this.terrain);
-
-        TerrainLodControl control = new TerrainLodControl(this.terrain, getCamera());
-        this.terrain.addControl(control);
-    }
-
     private void createMarker() {
         // collision marker
         Sphere sphere = new Sphere(8, 8, 0.5f);

+ 0 - 41
jme3-examples/src/main/java/jme3test/terrain/TerrainTestReadWrite.java

@@ -290,45 +290,4 @@ public class TerrainTestReadWrite extends SimpleApplication {
             }
         }
     };
-
-    // no junit tests, so this has to be hand-tested:
-    private static void testHeightmapBuilding() {
-        int s = 9;
-        int b = 3;
-        float[] hm = new float[s * s];
-        for (int i = 0; i < s; i++) {
-            for (int j = 0; j < s; j++) {
-                hm[(i * s) + j] = i * j;
-            }
-        }
-
-        for (int i = 0; i < s; i++) {
-            for (int j = 0; j < s; j++) {
-                System.out.print(hm[i * s + j] + " ");
-            }
-            System.out.println("");
-        }
-
-        TerrainQuad terrain = new TerrainQuad("terrain", b, s, hm);
-        float[] hm2 = terrain.getHeightMap();
-        boolean failed = false;
-        for (int i = 0; i < s * s; i++) {
-            if (hm[i] != hm2[i]) {
-                failed = true;
-            }
-        }
-
-        System.out.println("");
-        if (failed) {
-            System.out.println("Terrain heightmap building FAILED!!!");
-            for (int i = 0; i < s; i++) {
-                for (int j = 0; j < s; j++) {
-                    System.out.print(hm2[i * s + j] + " ");
-                }
-                System.out.println("");
-            }
-        } else {
-            System.out.println("Terrain heightmap building PASSED");
-        }
-    }
 }

+ 0 - 22
jme3-examples/src/main/java/jme3test/texture/TestImageRaster.java

@@ -66,28 +66,6 @@ public class TestImageRaster extends SimpleApplication {
         rootNode.attachChild(txt);
     }
     
-    private Image createTestImage() {
-        Image testImage = new Image(Format.BGR8, 4, 3, BufferUtils.createByteBuffer(4 * 4 * 3), null, ColorSpace.Linear);
-        
-        ImageRaster io = ImageRaster.create(testImage);
-        io.setPixel(0, 0, ColorRGBA.Black);
-        io.setPixel(1, 0, ColorRGBA.Gray);
-        io.setPixel(2, 0, ColorRGBA.White);
-        io.setPixel(3, 0, ColorRGBA.White.mult(4)); // HDR color
-
-        io.setPixel(0, 1, ColorRGBA.Red);
-        io.setPixel(1, 1, ColorRGBA.Green);
-        io.setPixel(2, 1, ColorRGBA.Blue);
-        io.setPixel(3, 1, new ColorRGBA(0, 0, 0, 0));
-
-        io.setPixel(0, 2, ColorRGBA.Yellow);
-        io.setPixel(1, 2, ColorRGBA.Magenta);
-        io.setPixel(2, 2, ColorRGBA.Cyan);
-        io.setPixel(3, 2, new ColorRGBA(1, 1, 1, 0));
-        
-        return testImage;
-    }
-   
     @Override
     public void simpleInitApp() {
         cam.setLocation(new Vector3f(16, 6, 36));

+ 0 - 55
jme3-examples/src/main/java/jme3test/water/TestPostWater.java

@@ -224,61 +224,6 @@ public class TestPostWater extends SimpleApplication {
         inputManager.addMapping("foam3", new KeyTrigger(KeyInput.KEY_3));
         inputManager.addMapping("upRM", new KeyTrigger(KeyInput.KEY_PGUP));
         inputManager.addMapping("downRM", new KeyTrigger(KeyInput.KEY_PGDN));
-//        createBox();
-//        createFire();
-    }
-    private Geometry box;
-
-    private void createBox() {
-        //creating a transluscent box
-        box = new Geometry("box", new Box(50, 50, 50));
-        Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
-        mat.setColor("Color", new ColorRGBA(1.0f, 0, 0, 0.3f));
-        mat.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        //mat.getAdditionalRenderState().setDepthWrite(false);
-        //mat.getAdditionalRenderState().setDepthTest(false);
-        box.setMaterial(mat);
-        box.setQueueBucket(Bucket.Translucent);
-
-
-        //creating a post view port
-//        ViewPort post=renderManager.createPostView("transpPost", cam);
-//        post.setClearFlags(false, true, true);
-
-
-        box.setLocalTranslation(-600, 0, 300);
-
-        //attaching the box to the post viewport
-        //Don't forget to updateGeometricState() the box in the simpleUpdate
-        //  post.attachScene(box);
-
-        rootNode.attachChild(box);
-    }
-
-    private void createFire() {
-        /**
-         * Uses Texture from jme3-test-data library!
-         */
-        ParticleEmitter fire = new ParticleEmitter("Emitter", ParticleMesh.Type.Triangle, 30);
-        Material mat_red = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
-        mat_red.setTexture("Texture", assetManager.loadTexture("Effects/Explosion/flame.png"));
-
-        fire.setMaterial(mat_red);
-        fire.setImagesX(2);
-        fire.setImagesY(2); // 2x2 texture animation
-        fire.setEndColor(new ColorRGBA(1f, 0f, 0f, 1f));   // red
-        fire.setStartColor(new ColorRGBA(1f, 1f, 0f, 0.5f)); // yellow
-        fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 2, 0));
-        fire.setStartSize(10f);
-        fire.setEndSize(1f);
-        fire.setGravity(0, 0, 0);
-        fire.setLowLife(0.5f);
-        fire.setHighLife(1.5f);
-        fire.getParticleInfluencer().setVelocityVariation(0.3f);
-        fire.setLocalTranslation(-600, 50, 300);
-
-        fire.setQueueBucket(Bucket.Translucent);
-        rootNode.attachChild(fire);
     }
 
     private void createTerrain(Node rootNode) {

+ 0 - 4
jme3-jogg/src/main/java/com/jme3/audio/plugins/CachedOggStream.java

@@ -79,10 +79,6 @@ public class CachedOggStream implements PhysicalOggStream {
         return lastPage;
     }
     
-    private LogicalOggStream getLogicalStream(int serialNumber) {
-        return logicalStreams.get(Integer.valueOf(serialNumber));
-    }
-
     @Override
     public Collection<LogicalOggStream> getLogicalStreams() {
         return logicalStreams.values();

+ 0 - 9
jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/FbxLoader.java

@@ -217,15 +217,6 @@ public class FbxLoader implements AssetLoader {
         }
     }
     
-    private void removeUnconnectedObjects() {
-        for (FbxObject object : new ArrayList<FbxObject>(objectMap.values())) {
-            if (!object.isJmeObjectCreated()) {
-                logger.log(Level.WARNING, "Purging orphan FBX object: {0}", object);
-                objectMap.remove(object.getId());
-            }
-        }
-    }
-    
     private void connectObjects(FbxElement element) {
         if (objectMap.isEmpty()) {
             logger.log(Level.WARNING, "FBX file is missing object information");

+ 0 - 31
jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/material/FbxMaterialProperties.java

@@ -68,37 +68,6 @@ public class FbxMaterialProperties {
         }
     }
 
-    private static boolean isValueAcceptable(Type type, Object value) {
-        if (type == Type.Ignore) {
-            return true;
-        }
-        if (value instanceof FbxTexture) {
-            switch (type) {
-                case Texture2D:
-                case Texture2DOrAlpha:
-                case Texture2DOrColor:
-                case Texture2DOrFactor:
-                    return true;
-            }
-        } else if (value instanceof ColorRGBA) {
-            switch (type) {
-                case Color:
-                case Texture2DOrColor:
-                    return true;
-            }
-        } else if (value instanceof Float) {
-            switch (type) {
-                case Alpha:
-                case Factor:
-                case Texture2DOrAlpha:
-                case Texture2DOrFactor:
-                    return true;
-            }
-        }
-        
-        return false;
-    }
-    
     private static void defineProp(String name, Type type) {
         propertyMetaMap.put(name, new FBXMaterialProperty(name, type));
     }