Commit 919ed318 authored by Human Gamer's avatar Human Gamer

Removed dae4j dependency as it was not being used

Fixed Warnings
parent 06b3bd40
......@@ -9,18 +9,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.dddviewr.collada.Collada;
import com.dddviewr.collada.geometry.Geometry;
import com.dddviewr.collada.geometry.Mesh;
import com.dddviewr.collada.geometry.Primitives;
import com.dddviewr.collada.materials.Material;
import com.matt.difinspector.io.ReverseDataInputStream;
import com.matt.difinspector.io.ReverseDataOutputStream;
import com.matt.difinspector.map.Brush;
import com.matt.difinspector.map.BrushPlane;
import com.matt.difinspector.materials.MaterialList;
import com.matt.difinspector.materials.TexGenList;
import com.matt.difinspector.materials.TorqueMaterial;
import com.matt.difinspector.models.OBJModel;
import com.matt.difinspector.models.OBJModel.OBJIndex;
import com.matt.difinspector.structures.AnimatedLight;
......@@ -1069,10 +1063,10 @@ public class Interior
Surface surface = this.surfaces[surfaceWinding];
short planeIndex = surface.getPlaneIndex();
planeIndex &= ~0x8000;
//short planeIndex = surface.getPlaneIndex();
//planeIndex &= ~0x8000;
PlaneF plane = this.planes[planeIndex];
//PlaneF plane = this.planes[planeIndex];
/*if (i == 272)
{
......@@ -3477,7 +3471,7 @@ public class Interior
return points;
}
public boolean processCollada(Collada dae)
/*public boolean processCollada(Collada dae)
{
List<Material> materials = dae.getLibraryMaterials().getMaterials();
......@@ -3605,7 +3599,7 @@ public class Interior
this.texMatIndices = new int[0];
return true;
}
}*/
public boolean processOBJ(OBJModel model)
{
......
......@@ -11,9 +11,6 @@ import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.List;
import org.xml.sax.SAXException;
import com.dddviewr.collada.Collada;
import com.matt.difinspector.io.ReverseDataInputStream;
import com.matt.difinspector.io.ReverseDataOutputStream;
import com.matt.difinspector.main.DifInspector;
......@@ -459,7 +456,7 @@ public class InteriorResource
public boolean readCollada(File file)
{
if (!file.exists())
/*if (!file.exists())
{
System.err.println("File '" + file.toString() + "' does not exist!");
return false;
......@@ -485,7 +482,7 @@ public class InteriorResource
} catch (SAXException e)
{
e.printStackTrace();
}
}*/
return false;
}
......
......@@ -32,7 +32,6 @@ import com.matt.difinspector.structures.Surface;
import com.matt.difinspector.structures.TexGenPlanes;
import com.matt.difinspector.structures.TexMatrix;
import com.matt.difinspector.structures.TriFan;
import com.matt.difinspector.structures.TriangleF;
import com.matt.difinspector.structures.Zone;
import com.matt.difinspector.util.ImageData;
import com.matt.difinspector.util.Util;
......@@ -259,7 +258,7 @@ public class InteriorBuilder
int ind = 0;
for (Face face : faces)
{
TriangleF triangle = face.getTriangle();
//TriangleF triangle = face.getTriangle();
int windingStart = ind * 3;//vertices.indexOfIndex(triangle.getPoint1());
int windingCount = 3;
short planeIndex = (short)planes.indexOfObject(face.getPlane());
......
......@@ -9,7 +9,6 @@ import java.util.List;
import com.matt.difinspector.structures.Point2F;
import com.matt.difinspector.structures.Point3F;
import com.matt.difinspector.util.Util;
public class OBJModel
{
......
......@@ -18,7 +18,7 @@ public class GLRender
//private boolean highlight;
//private boolean highlightHulls;
//private boolean highlightSurfaces;
private EnumSelectionMode selectionMode;
//private EnumSelectionMode selectionMode;
private int highlightIndex;
private boolean autoRotate;
......@@ -39,7 +39,7 @@ public class GLRender
this.frameTime = 1.0/frameRate;
this.selectionMode = EnumSelectionMode.NONE;
//this.selectionMode = EnumSelectionMode.NONE;
}
public void start()
......@@ -199,7 +199,7 @@ public class GLRender
public void setSelected(EnumSelectionMode mode, int index)
{
this.selectionMode = mode;
//this.selectionMode = mode;
this.highlightIndex = index;
if (this.interiorRender != null)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment