Merge pull request #309 from neph1/264-remove-ogrexml

#264 Removal of ogrexml. Unsure of whether I've caught everything, bu…

Author: neph1

jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java

@@ -13,10 +13,6 @@
 import com.jme3.material.MaterialList;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
-import com.jme3.scene.plugins.ogre.OgreMeshKey;
-import com.jme3.scene.plugins.ogre.matext.MaterialExtension;
-import com.jme3.scene.plugins.ogre.matext.MaterialExtensionSet;
-import com.jme3.scene.plugins.ogre.matext.OgreMaterialKey;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -115,61 +111,7 @@ private static Spatial loadSingleMesh(Element fileElement, NodeList fileNodeList
         if ("".equals(materialName)) {
             materialName = null;
         }
-
-        //PREPARE MATEXT
-        MaterialExtensionSet matExts = new MaterialExtensionSet();
-        /**
-         * /base/simple
-         * /base/normalmap
-         */
-        MaterialExtension baseLightExt = new MaterialExtension("/base/normalmap/specular",
-                "Common/MatDefs/Light/Lighting.j3md");
-        baseLightExt.setTextureMapping("DiffuseMap", "DiffuseMap");
-        baseLightExt.setTextureMapping("NormalHeightMap", "NormalMap");
-        baseLightExt.setTextureMapping("SpecularMap", "SpecularMap");
-        matExts.addMaterialExtension(baseLightExt);
-
-        MaterialExtension baseLightExt2 = new MaterialExtension("/base/normalmap",
-                "Common/MatDefs/Light/Lighting.j3md");
-        baseLightExt2.setTextureMapping("DiffuseMap", "DiffuseMap");
-        baseLightExt2.setTextureMapping("NormalHeightMap", "NormalMap");
-        baseLightExt2.setTextureMapping("SpecularMap", "SpecularMap");
-        matExts.addMaterialExtension(baseLightExt2);
-
-        MaterialExtension baseLightExt3 = new MaterialExtension("/base/simple",
-                "Common/MatDefs/Light/Lighting.j3md");
-        baseLightExt3.setTextureMapping("DiffuseMap", "DiffuseMap");
-        baseLightExt3.setTextureMapping("NormalHeightMap", "NormalMap");
-        baseLightExt3.setTextureMapping("SpecularMap", "SpecularMap");
-        matExts.addMaterialExtension(baseLightExt3);
-
-        //TODO: mesh.xml!!
-        if (hasExtension(name, "xml") || hasExtension(name, "scene")) {
-            for (int i = 0; i < fileNodeList.getLength(); i++) {
-                Element fileElem = (Element) fileNodeList.item(i);
-                String type = fileElem.getAttribute("type");
-                String path = fileElem.getAttribute("path");
-                if ("material".equals(type) && (materialName == null || materialName.equals(path))) {
-                    if (hasExtension(path, "j3m")) {
-                        mat = pm.loadMaterial(path);
-                    } else if (hasExtension(path, "material")) {
-                        if (matList == null) {
-                            Logger.getLogger(AssetPackLoader.class.getName()).log(Level.INFO, "Load Ogre Material");
-                            OgreMaterialKey matKey = new OgreMaterialKey(path);
-                            matKey.setMaterialExtensionSet(matExts);
-                            matList = pm.loadAsset(matKey);
-                            key = new OgreMeshKey(name, matList);
-                        } else {
-                            Logger.getLogger(AssetPackLoader.class.getName()).log(Level.INFO, "Add Ogre Material");
-                            OgreMaterialKey matKey = new OgreMaterialKey(path);
-                            matKey.setMaterialExtensionSet(matExts);
-                            MaterialList newMatList = pm.loadAsset(matKey);
-                            matList.putAll(newMatList);
-                        }
-                    }
-                }
-            }
-        } else if (hasExtension(name, "obj")) {
+        if (hasExtension(name, "obj")) {
             for (int i = 0; i < fileNodeList.getLength(); i++) {
                 Element fileElem = (Element) fileNodeList.item(i);
                 String type = fileElem.getAttribute("type");
@@ -194,19 +136,7 @@ private static Spatial loadSingleMesh(Element fileElement, NodeList fileNodeList
                         if (hasExtension(path, "j3m")) {
                             mat = pm.loadMaterial(path);
                         } else if (hasExtension(path, "material")) {
-                            if (matList == null) {
-                                Logger.getLogger(AssetPackLoader.class.getName()).log(Level.INFO, "Load Ogre Material");
-                                OgreMaterialKey matKey = new OgreMaterialKey(path);
-                                matKey.setMaterialExtensionSet(matExts);
-                                matList = pm.loadAsset(matKey);
-                                key = new OgreMeshKey(name, matList);
-                            } else {
-                                Logger.getLogger(AssetPackLoader.class.getName()).log(Level.INFO, "Add Ogre Material");
-                                OgreMaterialKey matKey = new OgreMaterialKey(path);
-                                matKey.setMaterialExtensionSet(matExts);
-                                MaterialList newMatList = pm.loadAsset(matKey);
-                                matList.putAll(newMatList);
-                            }
+                            Logger.getLogger(AssetPackLoader.class.getName()).log(Level.WARNING, "Ogre Material not supported.");
                         }
                     }
                 }

jme3-assetpack-support/src/com/jme3/gde/assetpack/project/AssetPackProjectLogicalView.java

@@ -2,8 +2,6 @@
 
 import com.jme3.gde.assetpack.browser.nodes.AssetPackBrowserFolder;
 import com.jme3.gde.assetpack.project.actions.CleanupProjectAction;
-import com.jme3.gde.assetpack.project.actions.ConvertOgreBinaryMeshesAction;
-import com.jme3.gde.assetpack.project.actions.ImportWorldForgeAction;
 import com.jme3.gde.assetpack.project.actions.PublishAssetPackAction;
 import java.awt.Image;
 import java.util.LinkedList;
@@ -61,14 +59,12 @@ public ProjectNode(AssetPackProject project) throws DataObjectNotFoundException
         public Action[] getActions(boolean arg0) {
             Action[] nodeActions = new Action[9];
             nodeActions[0] = new PublishAssetPackAction(project);
-            nodeActions[1] = new ConvertOgreBinaryMeshesAction(project);
-            nodeActions[2] = new ImportWorldForgeAction(project);
-            nodeActions[3] = new CleanupProjectAction(project);
-            nodeActions[4] = CommonProjectActions.copyProjectAction();
-            nodeActions[5] = CommonProjectActions.deleteProjectAction();
-            nodeActions[6] = CommonProjectActions.setAsMainProjectAction();
-            nodeActions[7] = CommonProjectActions.closeProjectAction();
-            nodeActions[8] = CommonProjectActions.customizeProjectAction();
+            nodeActions[1] = new CleanupProjectAction(project);
+            nodeActions[2] = CommonProjectActions.copyProjectAction();
+            nodeActions[3] = CommonProjectActions.deleteProjectAction();
+            nodeActions[4] = CommonProjectActions.setAsMainProjectAction();
+            nodeActions[5] = CommonProjectActions.closeProjectAction();
+            nodeActions[6] = CommonProjectActions.customizeProjectAction();
             return nodeActions;
         }