speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

trackeditor: add more unit support

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8337 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 9e57740e0b5d0afa068eb48807af666ebc4796a1
Former-commit-id: 6035ccf8d31ef75a03be54c4c14de8710ea15e9c
This commit is contained in:
iobyte 2022-07-28 14:21:54 +00:00
parent 0178bd09ef
commit decb0996a3
2 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/tools/trackeditor/plugin/torcs/XmlReader.java
View file

@ -249,10 +249,10 @@ public class XmlReader
data.setRows(getAttrIntValue(element, "rows"));
data.setPolePositionSide(getAttrStrValue(element, "pole position side"));
data.setDistanceToStart(getAttrNumValue(element, "distance to start"));
data.setDistanceBetweenColumns(getAttrNumValue(element, "distance between columns"));
data.setOffsetWithinAColumn(getAttrNumValue(element, "offset within a column"));
data.setInitialHeight(getAttrNumValue(element, "initial height"));
data.setDistanceToStart(getAttrNumValue(element, "distance to start", "m"));
data.setDistanceBetweenColumns(getAttrNumValue(element, "distance between columns", "m"));
data.setOffsetWithinAColumn(getAttrNumValue(element, "offset within a column", "m"));
data.setInitialHeight(getAttrNumValue(element, "initial height", "m"));
editorFrame.getTrackData().setStartingGrid(data);
}
@ -271,12 +271,12 @@ public class XmlReader
data.setStation(getAttrStrValue(element, "station"));
data.setTimezone(getAttrNumValue(element, "timezone"));
data.setOverallRainLikelyhood(getAttrNumValue(element, "overall rain likelyhood"));
data.setLittleRainLikelyhood(getAttrNumValue(element, "little rain likelyhood"));
data.setMediumRainLikelyhood(getAttrNumValue(element, "medium rain likelyhood"));
data.setTimeOfDay(getAttrNumValue(element, "time of day"));
data.setSunAscension(getAttrNumValue(element, "sun ascension"));
data.setAltitude(getAttrNumValue(element, "altitude"));
data.setOverallRainLikelyhood(getAttrNumValue(element, "overall rain likelyhood", "%"));
data.setLittleRainLikelyhood(getAttrNumValue(element, "little rain likelyhood", "%"));
data.setMediumRainLikelyhood(getAttrNumValue(element, "medium rain likelyhood", "%"));
data.setTimeOfDay(getAttrNumValue(element, "time of day", "hour"));
data.setSunAscension(getAttrNumValue(element, "sun ascension", "deg"));
data.setAltitude(getAttrNumValue(element, "altitude", "m"));
editorFrame.getTrackData().setLocalInfo(data);
}
@ -314,16 +314,16 @@ public class XmlReader
surf.setColorB2(getAttrNumValue(surface, "color B2"));
surf.setTextureName(getAttrStrValue(surface, "texture name"));
surf.setTextureType(getAttrStrValue(surface, "texture type"));
surf.setTextureSize(getAttrNumValue(surface, "texture size"));
surf.setTextureSize(getAttrNumValue(surface, "texture size", "m"));
surf.setTextureLinkWithPrevious(getAttrStrValue(surface, "texture link with previous"));
surf.setTextureStartOnBoundary(getAttrStrValue(surface, "texture start on boundary"));
surf.setTextureMipMap(getAttrNumValue(surface, "texture mipmap"));
surf.setTextureMipMap(getAttrNumValue(surface, "texture mipmap", "m"));
surf.setFriction(getAttrNumValue(surface, "friction"));
surf.setRollingResistance(getAttrNumValue(surface, "rolling resistance"));
surf.setBumpName(getAttrStrValue(surface, "bump name"));
surf.setBumpSize(getAttrNumValue(surface, "bump size"));
surf.setRoughness(getAttrNumValue(surface, "roughness"));
surf.setRoughnessWavelength(getAttrNumValue(surface, "roughness wavelength"));
surf.setBumpSize(getAttrNumValue(surface, "bump size", "m"));
surf.setRoughness(getAttrNumValue(surface, "roughness", "m"));
surf.setRoughnessWavelength(getAttrNumValue(surface, "roughness wavelength", "m"));
surf.setRacelineName(getAttrStrValue(surface, "raceline name"));
surf.setDammage(getAttrNumValue(surface, "dammage"));
surf.setRebound(getAttrNumValue(surface, "rebound"));
@ -405,22 +405,22 @@ public class XmlReader
{
data.getTurnMarks().setWidth(getAttrNumValue(marks, "width", "m"));
data.getTurnMarks().setHeight(getAttrNumValue(marks, "height", "m"));
data.getTurnMarks().setVerticalSpace(getAttrNumValue(marks, "vertical space"));
data.getTurnMarks().setHorizontalSpace(getAttrNumValue(marks, "horizontal space"));
data.getTurnMarks().setVerticalSpace(getAttrNumValue(marks, "vertical space", "m"));
data.getTurnMarks().setHorizontalSpace(getAttrNumValue(marks, "horizontal space", "m"));
}
Element terrain = getChildWithName(graphic, "Terrain Generation");
if (terrain != null)
{
data.getTerrainGeneration().setTrackStep(getAttrNumValue(terrain, "track step"));
data.getTerrainGeneration().setBorderMargin(getAttrNumValue(terrain, "border margin"));
data.getTerrainGeneration().setBorderStep(getAttrNumValue(terrain, "border step"));
data.getTerrainGeneration().setTrackStep(getAttrNumValue(terrain, "track step", "m"));
data.getTerrainGeneration().setBorderMargin(getAttrNumValue(terrain, "border margin", "m"));
data.getTerrainGeneration().setBorderStep(getAttrNumValue(terrain, "border step", "m"));
data.getTerrainGeneration().setBorderHeight(getAttrNumValue(terrain, "border height", "m"));
data.getTerrainGeneration().setOrientation(getAttrStrValue(terrain, "orientation"));
data.getTerrainGeneration().setMaximumAltitude(getAttrNumValue(terrain, "maximum altitude"));
data.getTerrainGeneration().setMinimumAltitude(getAttrNumValue(terrain, "minimum altitude"));
data.getTerrainGeneration().setGroupSize(getAttrNumValue(terrain, "group size"));
data.getTerrainGeneration().setMaximumAltitude(getAttrNumValue(terrain, "maximum altitude", "m"));
data.getTerrainGeneration().setMinimumAltitude(getAttrNumValue(terrain, "minimum altitude", "m"));
data.getTerrainGeneration().setGroupSize(getAttrNumValue(terrain, "group size", "m"));
data.getTerrainGeneration().setElevationMap(getAttrStrValue(terrain, "elevation map"));
data.getTerrainGeneration().setReliefFile(getAttrStrValue(terrain, "relief file"));
data.getTerrainGeneration().setSurface(getAttrStrValue(terrain, "surface"));
@ -873,6 +873,14 @@ public class XmlReader
{
out = out * 0.001;
}
else if (expectedUnit.equals("rad") && actualUnit.equals("deg"))
{
out = out * Math.PI / 180.0;
}
else if (expectedUnit.equals("s") && (actualUnit.equals("hour") || actualUnit.equals("hours")))
{
out = out * 3600.0;
}
else
{
System.out.println("can't convert " + expectedUnit +" to " + actualUnit);

14
src/tools/trackeditor/plugin/torcs/XmlWriter.java
View file

@ -472,16 +472,16 @@ public class XmlWriter
addContent(el, "color B2", null, surface.getColorB2());
addContent(el, "texture name", surface.getTextureName());
addContent(el, "texture type", surface.getTextureType());
addContent(el, "texture size", null, surface.getTextureSize());
addContent(el, "texture size", "m", surface.getTextureSize());
addContent(el, "texture link with previous", surface.getTextureLinkWithPrevious());
addContent(el, "texture start on boundary", surface.getTextureStartOnBoundary());
addContent(el, "texture mipmap", "m", surface.getTextureMipMap());
addContent(el, "friction", null, surface.getFriction());
addContent(el, "rolling resistance", null, surface.getRollingResistance());
addContent(el, "bump name", surface.getBumpName());
addContent(el, "bump size", null, surface.getBumpSize());
addContent(el, "roughness", null, surface.getRoughness());
addContent(el, "roughness wavelength", null, surface.getRoughnessWavelength());
addContent(el, "bump size", "m", surface.getBumpSize());
addContent(el, "roughness", "m", surface.getRoughness());
addContent(el, "roughness wavelength", "m", surface.getRoughnessWavelength());
addContent(el, "raceline name", surface.getRacelineName());
addContent(el, "dammage", null, surface.getDammage());
addContent(el, "rebound", null, surface.getRebound());
@ -752,9 +752,9 @@ public class XmlWriter
addContent(element, "specular color R", null, editorFrame.getTrackData().getGraphic().getSpecularColorR());
addContent(element, "specular color G", null, editorFrame.getTrackData().getGraphic().getSpecularColorG());
addContent(element, "specular color B", null, editorFrame.getTrackData().getGraphic().getSpecularColorB());
addContent(element, "light position x", null, editorFrame.getTrackData().getGraphic().getLightPositionX());
addContent(element, "light position y", null, editorFrame.getTrackData().getGraphic().getLightPositionY());
addContent(element, "light position z", null, editorFrame.getTrackData().getGraphic().getLightPositionZ());
addContent(element, "light position x", "m", editorFrame.getTrackData().getGraphic().getLightPositionX());
addContent(element, "light position y", "m", editorFrame.getTrackData().getGraphic().getLightPositionY());
addContent(element, "light position z", "m", editorFrame.getTrackData().getGraphic().getLightPositionZ());
addContent(element, "shininess", null, editorFrame.getTrackData().getGraphic().getShininess());
addContent(element, "fov factor", null, editorFrame.getTrackData().getGraphic().getFovFactor());