speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

trackeditor: increase numeric text field width

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

Former-commit-id: 84a53569dd00492e953b2b932476141301c9f188
Former-commit-id: 9a8147c54c529122d012c97b3719ea1ae342dbe7
This commit is contained in:
iobyte 2022-09-14 14:24:55 +00:00
parent 3a920eff29
commit e75c417c1f
13 changed files with 132 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tools/trackeditor/gui/properties/CameraProperties.java
View file

@ -187,13 +187,13 @@ public class CameraProperties extends PropertyPanel
addLabel(this, 5, fovStartLabel, "Fov Start", 130);
addLabel(this, 6, fovEndLabel, "Fov End", 130);
addTextField(this, 0, nameTextField, camera.getName(), 150, 100);
addTextField(this, 1, segmentTextField, camera.getSegment(), 150, 100);
addTextField(this, 2, toRightTextField, camera.getToRight(), 150, 100);
addTextField(this, 3, toStartTextField, camera.getToStart(), 150, 100);
addTextField(this, 4, heightTextField, camera.getHeight(), 150, 100);
addTextField(this, 5, fovStartTextField, camera.getFovStart(), 150, 100);
addTextField(this, 6, fovEndTextField, camera.getFovEnd(), 150, 100);
addTextField(this, 0, nameTextField, camera.getName(), 150, 125);
addTextField(this, 1, segmentTextField, camera.getSegment(), 150, 125);
addTextField(this, 2, toRightTextField, camera.getToRight(), 150, 125);
addTextField(this, 3, toStartTextField, camera.getToStart(), 150, 125);
addTextField(this, 4, heightTextField, camera.getHeight(), 150, 125);
addTextField(this, 5, fovStartTextField, camera.getFovStart(), 150, 125);
addTextField(this, 6, fovEndTextField, camera.getFovEnd(), 150, 125);
}
}

10
src/tools/trackeditor/gui/properties/GeneralProperties.java
View file

@ -85,7 +85,7 @@ public class GeneralProperties extends PropertyPanel
addLabel(this, 7, copyrightLabel, "Copyright", 80);
addLabel(this, 8, descriptionLabel, "Description", 80);
addTextField(this, 0, nameTextField, getEditorFrame().getTrackData().getHeader().getName(), 130, 150);
addTextField(this, 0, nameTextField, getEditorFrame().getTrackData().getHeader().getName(), 130, 200);
add(getCategoryComboBox(), null);
add(getSubcategoryComboBox(), null);
@ -109,7 +109,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"circuit", "development", "dirt", "gprix", "karting", "oval", "road", "speedway", "test"};
categoryComboBox = new JComboBox<String>(items);
categoryComboBox.setBounds(130, 37, 100, 23);
categoryComboBox.setBounds(130, 37, 125, 23);
categoryComboBox.setSelectedItem(getEditorFrame().getTrackData().getHeader().getCategory());
}
return categoryComboBox;
@ -126,7 +126,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"none", "short", "long"};
subcategoryComboBox = new JComboBox<String>(items);
subcategoryComboBox.setBounds(130, 64, 100, 23);
subcategoryComboBox.setBounds(130, 64, 125, 23);
String subcategory = getEditorFrame().getTrackData().getHeader().getSubcategory();
if (subcategory == null)
subcategory = "none";
@ -146,7 +146,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"3", "4", "5"};
versionComboBox = new JComboBox<String>(items);
versionComboBox.setBounds(130, 91, 100, 23);
versionComboBox.setBounds(130, 91, 125, 23);
versionComboBox.setSelectedItem(getEditorFrame().getTrackData().getHeader().getVersion() + "");
}
return versionComboBox;
@ -163,7 +163,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"none", "1"};
skyVersionComboBox = new JComboBox<String>(items);
skyVersionComboBox.setBounds(130, 118, 100, 23);
skyVersionComboBox.setBounds(130, 118, 125, 23);
int version = getEditorFrame().getTrackData().getHeader().getSkyVersion();
String stringVersion;
if (version == Integer.MAX_VALUE)

42
src/tools/trackeditor/gui/properties/GraphicProperties.java
View file

@ -132,30 +132,30 @@ public class GraphicProperties extends PropertyPanel
addLabel(this, 20, shininessLabel, "Shininess", 150);
addLabel(this, 21, fovFactorLabel, "Fov Factor", 150);
addTextField(this, 0, descriptionTextField, getEditorFrame().getTrackData().getGraphic().getDescription(), 160, 150);
addTextField(this, 1, descriptionNightTextField, getEditorFrame().getTrackData().getGraphic().getDescriptionNight(), 160, 150);
addTextField(this, 2, descriptionRainNightTextField, getEditorFrame().getTrackData().getGraphic().getDescriptionRainNight(), 160, 150);
addTextField(this, 0, descriptionTextField, getEditorFrame().getTrackData().getGraphic().getDescription(), 160, 200);
addTextField(this, 1, descriptionNightTextField, getEditorFrame().getTrackData().getGraphic().getDescriptionNight(), 160, 200);
addTextField(this, 2, descriptionRainNightTextField, getEditorFrame().getTrackData().getGraphic().getDescriptionRainNight(), 160, 200);
addTextField(this, 3, backgroundImageTextField, getEditorFrame().getTrackData().getGraphic().getBackgroundImage(), 160, 275);
add(getBackgroundTypeComboBox(), null);
addTextField(this, 5, backgroundColorRTextField, getEditorFrame().getTrackData().getGraphic().getBackgroundColorR(), 160, 80);
addTextField(this, 6, backgroundColorGTextField, getEditorFrame().getTrackData().getGraphic().getBackgroundColorG(), 160, 80);
addTextField(this, 7, backgroundColorBTextField, getEditorFrame().getTrackData().getGraphic().getBackgroundColorB(), 160, 80);
addTextField(this, 8, ambientColorRTextField, getEditorFrame().getTrackData().getGraphic().getAmbientColorR(), 160, 80);
addTextField(this, 9, ambientColorGTextField, getEditorFrame().getTrackData().getGraphic().getAmbientColorG(), 160, 80);
addTextField(this, 10, ambientColorBTextField, getEditorFrame().getTrackData().getGraphic().getAmbientColorB(), 160, 80);
addTextField(this, 11, diffuseColorRTextField, getEditorFrame().getTrackData().getGraphic().getDiffuseColorR(), 160, 80);
addTextField(this, 12, diffuseColorGTextField, getEditorFrame().getTrackData().getGraphic().getDiffuseColorG(), 160, 80);
addTextField(this, 13, diffuseColorBTextField, getEditorFrame().getTrackData().getGraphic().getDiffuseColorB(), 160, 80);
addTextField(this, 14, specularColorRTextField, getEditorFrame().getTrackData().getGraphic().getSpecularColorR(), 160, 80);
addTextField(this, 15, specularColorGTextField, getEditorFrame().getTrackData().getGraphic().getSpecularColorG(), 160, 80);
addTextField(this, 16, specularColorBTextField, getEditorFrame().getTrackData().getGraphic().getSpecularColorB(), 160, 80);
addTextField(this, 17, lightPositionXTextField, getEditorFrame().getTrackData().getGraphic().getLightPositionX(), 160, 80);
addTextField(this, 18, lightPositionYTextField, getEditorFrame().getTrackData().getGraphic().getLightPositionY(), 160, 80);
addTextField(this, 19, lightPositionZTextField, getEditorFrame().getTrackData().getGraphic().getLightPositionZ(), 160, 80);
addTextField(this, 20, shininessTextField, getEditorFrame().getTrackData().getGraphic().getShininess(), 160, 80);
addTextField(this, 21, fovFactorTextField, getEditorFrame().getTrackData().getGraphic().getFovFactor(), 160, 80);
addTextField(this, 5, backgroundColorRTextField, getEditorFrame().getTrackData().getGraphic().getBackgroundColorR(), 160, 125);
addTextField(this, 6, backgroundColorGTextField, getEditorFrame().getTrackData().getGraphic().getBackgroundColorG(), 160, 125);
addTextField(this, 7, backgroundColorBTextField, getEditorFrame().getTrackData().getGraphic().getBackgroundColorB(), 160, 125);
addTextField(this, 8, ambientColorRTextField, getEditorFrame().getTrackData().getGraphic().getAmbientColorR(), 160, 125);
addTextField(this, 9, ambientColorGTextField, getEditorFrame().getTrackData().getGraphic().getAmbientColorG(), 160, 125);
addTextField(this, 10, ambientColorBTextField, getEditorFrame().getTrackData().getGraphic().getAmbientColorB(), 160, 125);
addTextField(this, 11, diffuseColorRTextField, getEditorFrame().getTrackData().getGraphic().getDiffuseColorR(), 160, 125);
addTextField(this, 12, diffuseColorGTextField, getEditorFrame().getTrackData().getGraphic().getDiffuseColorG(), 160, 125);
addTextField(this, 13, diffuseColorBTextField, getEditorFrame().getTrackData().getGraphic().getDiffuseColorB(), 160, 125);
addTextField(this, 14, specularColorRTextField, getEditorFrame().getTrackData().getGraphic().getSpecularColorR(), 160, 125);
addTextField(this, 15, specularColorGTextField, getEditorFrame().getTrackData().getGraphic().getSpecularColorG(), 160, 125);
addTextField(this, 16, specularColorBTextField, getEditorFrame().getTrackData().getGraphic().getSpecularColorB(), 160, 125);
addTextField(this, 17, lightPositionXTextField, getEditorFrame().getTrackData().getGraphic().getLightPositionX(), 160, 125);
addTextField(this, 18, lightPositionYTextField, getEditorFrame().getTrackData().getGraphic().getLightPositionY(), 160, 125);
addTextField(this, 19, lightPositionZTextField, getEditorFrame().getTrackData().getGraphic().getLightPositionZ(), 160, 125);
addTextField(this, 20, shininessTextField, getEditorFrame().getTrackData().getGraphic().getShininess(), 160, 125);
addTextField(this, 21, fovFactorTextField, getEditorFrame().getTrackData().getGraphic().getFovFactor(), 160, 125);
add(getBackgroundImageButton(), null);
}
@ -172,7 +172,7 @@ public class GraphicProperties extends PropertyPanel
String[] types = {"none", "0", "2", "4"};
backgroundTypeComboBox = new JComboBox<String>();
backgroundTypeComboBox.setModel(new DefaultComboBoxModel<String>(types));
backgroundTypeComboBox.setBounds(160, 118, 80, 23);
backgroundTypeComboBox.setBounds(160, 118, 125, 23);
int value = getEditorFrame().getTrackData().getGraphic().getBackgroundType();
if (value != Integer.MAX_VALUE)
backgroundTypeComboBox.setSelectedItem(String.valueOf(value));

2
src/tools/trackeditor/gui/properties/ImageProperties.java
View file

@ -69,7 +69,7 @@ public class ImageProperties extends PropertyPanel
addLabel(this, 1, pathLabel, "Image scale", 80);
addTextField(this, 0, pathTextField, Editor.getProperties().getImage(), 100, 335);
addTextField(this, 1, imageScaleTextField, Editor.getProperties().getImageScale(), 100, 50);
addTextField(this, 1, imageScaleTextField, Editor.getProperties().getImageScale(), 100, 125);
this.add(getPathButton(), null);
}

16
src/tools/trackeditor/gui/properties/LocalInfoProperties.java
View file

@ -78,14 +78,14 @@ public class LocalInfoProperties extends PropertyPanel
addLabel(this, 6, sunAscensionLabel, "Sun Ascension", 150);
addLabel(this, 7, altitudeLabel, "Altitude", 150);
addTextField(this, 0, stationTextField, getEditorFrame().getTrackData().getLocalInfo().getStation(), 170, 100);
addTextField(this, 1, timezoneTextField, getEditorFrame().getTrackData().getLocalInfo().getTimezone(), 170, 100);
addTextField(this, 2, overallRainLikelyhoodTextField, getEditorFrame().getTrackData().getLocalInfo().getOverallRainLikelyhood(), 170, 100);
addTextField(this, 3, littleRainLikelyhoodTextField, getEditorFrame().getTrackData().getLocalInfo().getLittleRainLikelyhood(), 170, 100);
addTextField(this, 4, mediumRainLikelyhoodTextField, getEditorFrame().getTrackData().getLocalInfo().getMediumRainLikelyhood(), 170, 100);
addTextField(this, 5, timeOfDayTextField, getEditorFrame().getTrackData().getLocalInfo().getTimeOfDay(), 170, 100);
addTextField(this, 6, sunAscensionTextField, getEditorFrame().getTrackData().getLocalInfo().getSunAscension(), 170, 100);
addTextField(this, 7, altitudeTextField, getEditorFrame().getTrackData().getLocalInfo().getAltitude(), 170, 100);
addTextField(this, 0, stationTextField, getEditorFrame().getTrackData().getLocalInfo().getStation(), 170, 125);
addTextField(this, 1, timezoneTextField, getEditorFrame().getTrackData().getLocalInfo().getTimezone(), 170, 125);
addTextField(this, 2, overallRainLikelyhoodTextField, getEditorFrame().getTrackData().getLocalInfo().getOverallRainLikelyhood(), 170, 125);
addTextField(this, 3, littleRainLikelyhoodTextField, getEditorFrame().getTrackData().getLocalInfo().getLittleRainLikelyhood(), 170, 125);
addTextField(this, 4, mediumRainLikelyhoodTextField, getEditorFrame().getTrackData().getLocalInfo().getMediumRainLikelyhood(), 170, 125);
addTextField(this, 5, timeOfDayTextField, getEditorFrame().getTrackData().getLocalInfo().getTimeOfDay(), 170, 125);
addTextField(this, 6, sunAscensionTextField, getEditorFrame().getTrackData().getLocalInfo().getSunAscension(), 170, 125);
addTextField(this, 7, altitudeTextField, getEditorFrame().getTrackData().getLocalInfo().getAltitude(), 170, 125);
}
/**

20
src/tools/trackeditor/gui/properties/ObjectProperties.java
View file

@ -291,23 +291,23 @@ public class ObjectProperties extends PropertyPanel
addLabel(this, 9, scaleMinLabel, "Scale Min", 160);
addLabel(this, 10, scaleMaxLabel, "Scale Max", 160);
addTextField(this, 0, nameTextField, object.getName(), 120, 100);
addTextField(this, 0, nameTextField, object.getName(), 120, 125);
addTextField(this, 1, objectTextField, object.getObject(), 120, 290);
addTextField(this, 2, colorTextField, toHexString(object.getColor()), 120, 100);
addTextField(this, 2, colorTextField, toHexString(object.getColor()), 120, 125);
add(getOrientationTypeComboBox(), null);
getOrientationTypeComboBox().setSelectedItem(toNoneString(object.getOrientationType()));
addTextField(this, 4, orientationTextField, object.getOrientation(), 120, 100);
addTextField(this, 5, deltaHeightTextField, object.getDeltaHeight(), 120, 100);
addTextField(this, 6, deltaVertTextField, object.getDeltaVert(), 120, 100);
addTextField(this, 4, orientationTextField, object.getOrientation(), 120, 125);
addTextField(this, 5, deltaHeightTextField, object.getDeltaHeight(), 120, 125);
addTextField(this, 6, deltaVertTextField, object.getDeltaVert(), 120, 125);
add(getScaleTypeComboBox(), null);
getScaleTypeComboBox().setSelectedItem(toNoneString(object.getScaleType()));
addTextField(this, 8, scaleTextField, object.getScale(), 120, 100);
addTextField(this, 9, scaleMinTextField, object.getScaleMin(), 120, 100);
addTextField(this, 10, scaleMaxTextField, object.getScaleMax(), 120, 100);
addTextField(this, 8, scaleTextField, object.getScale(), 120, 125);
addTextField(this, 9, scaleMinTextField, object.getScaleMin(), 120, 125);
addTextField(this, 10, scaleMaxTextField, object.getScaleMax(), 120, 125);
if (defaultObjects)
{
@ -335,7 +335,7 @@ public class ObjectProperties extends PropertyPanel
{
String[] items = {"none", "random", "standard", "track", "terrain", "border"};
orientationTypeComboBox = new JComboBox<String>(items);
orientationTypeComboBox.setBounds(120, 91, 120, 23);
orientationTypeComboBox.setBounds(120, 91, 125, 23);
}
return orientationTypeComboBox;
}
@ -346,7 +346,7 @@ public class ObjectProperties extends PropertyPanel
{
String[] items = {"none", "random", "fixed"};
scaleTypeComboBox = new JComboBox<String>(items);
scaleTypeComboBox.setBounds(120, 201, 120, 23);
scaleTypeComboBox.setBounds(120, 201, 125, 23);
scaleTypeComboBox.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(java.awt.event.ActionEvent e)

32
src/tools/trackeditor/gui/properties/PitProperties.java
View file

@ -152,19 +152,19 @@ public class PitProperties extends PropertyPanel
Pits pits = getEditorFrame().getTrackData().getMainTrack().getPits();
addTextField(this, 2, entryTextField, pits.getEntry(), 120, 100);
addTextField(this, 3, startTextField, pits.getStart(), 120, 100);
addTextField(this, 4, startBuildingsTextField, pits.getStartBuildings(), 120, 100);
addTextField(this, 5, stopBuildingsTextField, pits.getStopBuildings(), 120, 100);
addTextField(this, 6, maxPitsTextField, pits.getMaxPits(), 120, 100);
addTextField(this, 7, endTextField, pits.getEnd(), 120, 100);
addTextField(this, 8, exitTextField, pits.getExit(), 120, 100);
addTextField(this, 9, widthTextField, pits.getWidth(), 120, 40);
addTextField(this, 10, lengthTextField, pits.getLength(), 120, 40);
addTextField(this, 2, entryTextField, pits.getEntry(), 120, 125);
addTextField(this, 3, startTextField, pits.getStart(), 120, 125);
addTextField(this, 4, startBuildingsTextField, pits.getStartBuildings(), 120, 125);
addTextField(this, 5, stopBuildingsTextField, pits.getStopBuildings(), 120, 125);
addTextField(this, 6, maxPitsTextField, pits.getMaxPits(), 120, 125);
addTextField(this, 7, endTextField, pits.getEnd(), 120, 125);
addTextField(this, 8, exitTextField, pits.getExit(), 120, 125);
addTextField(this, 9, widthTextField, pits.getWidth(), 120, 125);
addTextField(this, 10, lengthTextField, pits.getLength(), 120, 125);
add(getIndicatorComboBox(), null);
addTextField(this, 12, speedLimitTextField, pits.getSpeedLimit(), 120, 40);
addTextField(this, 12, speedLimitTextField, pits.getSpeedLimit(), 120, 125);
add(getGeneratePitsCheckBox(), null);
add(getTabbedPane(), null);
@ -207,7 +207,7 @@ public class PitProperties extends PropertyPanel
{
String[] items = {"none", "no pits", "on track side", "on separate path", "no building"};
styleComboBox = new JComboBox<String>(items);
styleComboBox.setBounds(120, 10, 120, 23);
styleComboBox.setBounds(120, 10, 125, 23);
int style = getEditorFrame().getTrackData().getMainTrack().getPits().getStyle();
if (style == Integer.MAX_VALUE)
style = 0;
@ -229,7 +229,7 @@ public class PitProperties extends PropertyPanel
{
String[] items = {"none", "right", "left"};
sideComboBox = new JComboBox<String>(items);
sideComboBox.setBounds(120, 37, 80, 23);
sideComboBox.setBounds(120, 37, 125, 23);
String side = getEditorFrame().getTrackData().getMainTrack().getPits().getSide();
if (side == null || side.isEmpty())
side = "none";
@ -249,7 +249,7 @@ public class PitProperties extends PropertyPanel
{
String[] items = {"none", "no", "yes"};
indicatorComboBox = new JComboBox<String>(items);
indicatorComboBox.setBounds(120, 307, 80, 23);
indicatorComboBox.setBounds(120, 307, 125, 23);
int indicator = getEditorFrame().getTrackData().getMainTrack().getPits().getIndicator();
if (indicator == Integer.MAX_VALUE)
indicator = 0;
@ -521,8 +521,8 @@ public class PitProperties extends PropertyPanel
add(getSurfaceComboBox(), null);
add(getBorderTypeComboBox(), null);
add(getBorderSurfaceComboBox(), null);
addTextField(this, 3, borderHeightTextField, 0, 130, 100);
addTextField(this, 4, borderWidthTextField, 0, 130, 280);
addTextField(this, 3, borderHeightTextField, 0, 130, 125);
addTextField(this, 4, borderWidthTextField, 0, 130, 125);
setPitInfo(pitInfo);
}
@ -565,7 +565,7 @@ public class PitProperties extends PropertyPanel
{
String[] types = { "none", "curb", "wall" };
borderTypeComboBox = new JComboBox<String>(types);
borderTypeComboBox.setBounds(130, 38, 180, 23);
borderTypeComboBox.setBounds(130, 38, 125, 23);
borderTypeComboBox.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)

12
src/tools/trackeditor/gui/properties/StartingGridProperties.java
View file

@ -73,14 +73,14 @@ public class StartingGridProperties extends PropertyPanel
addLabel(this, 4, offsetWithinAColumnLabel, "Offset Within A Column", 180);
addLabel(this, 5, initialHeightLabel, "Initial Height", 180);
addTextField(this, 0, rowsTextField, getEditorFrame().getTrackData().getStartingGrid().getRows(), 190, 100);
addTextField(this, 0, rowsTextField, getEditorFrame().getTrackData().getStartingGrid().getRows(), 190, 125);
add(getPolePositionSideComboBox(), null);
addTextField(this, 2, distanceToStartTextField, getEditorFrame().getTrackData().getStartingGrid().getDistanceToStart(), 190, 100);
addTextField(this, 3, distanceBetweenColumnsTextField, getEditorFrame().getTrackData().getStartingGrid().getDistanceBetweenColumns(), 190, 100);
addTextField(this, 4, offsetWithinAColumnTextField, getEditorFrame().getTrackData().getStartingGrid().getOffsetWithinAColumn(), 190, 100);
addTextField(this, 5, initialHeightTextField, getEditorFrame().getTrackData().getStartingGrid().getInitialHeight(), 190, 100);
addTextField(this, 2, distanceToStartTextField, getEditorFrame().getTrackData().getStartingGrid().getDistanceToStart(), 190, 125);
addTextField(this, 3, distanceBetweenColumnsTextField, getEditorFrame().getTrackData().getStartingGrid().getDistanceBetweenColumns(), 190, 125);
addTextField(this, 4, offsetWithinAColumnTextField, getEditorFrame().getTrackData().getStartingGrid().getOffsetWithinAColumn(), 190, 125);
addTextField(this, 5, initialHeightTextField, getEditorFrame().getTrackData().getStartingGrid().getInitialHeight(), 190, 125);
}
/**
@ -94,7 +94,7 @@ public class StartingGridProperties extends PropertyPanel
{
String[] items = {"none", "right", "left"};
polePositionSideComboBox = new JComboBox<String>(items);
polePositionSideComboBox.setBounds(190, 37, 80, 23);
polePositionSideComboBox.setBounds(190, 37, 125, 23);
String side = getEditorFrame().getTrackData().getStartingGrid().getPolePositionSide();
if (side == null || side.isEmpty())
side = "none";

38
src/tools/trackeditor/gui/properties/SurfaceProperties.java
View file

@ -311,35 +311,35 @@ public class SurfaceProperties extends PropertyPanel
addLabel(this, 20, damageLabel, "Damage", 180);
addLabel(this, 21, reboundLabel, "Rebound", 180);
addTextField(this, 0, nameTextField, surface.getName(), 190, 100);
addTextField(this, 1, colorR1TextField, surface.getColorR1(), 190, 100);
addTextField(this, 2, colorG1TextField, surface.getColorG1(), 190, 100);
addTextField(this, 3, colorB1TextField, surface.getColorB1(), 190, 100);
addTextField(this, 4, colorR2TextField, surface.getColorR2(), 190, 100);
addTextField(this, 5, colorG2TextField, surface.getColorG2(), 190, 100);
addTextField(this, 6, colorB2TextField, surface.getColorB2(), 190, 100);
addTextField(this, 0, nameTextField, surface.getName(), 190, 125);
addTextField(this, 1, colorR1TextField, surface.getColorR1(), 190, 125);
addTextField(this, 2, colorG1TextField, surface.getColorG1(), 190, 125);
addTextField(this, 3, colorB1TextField, surface.getColorB1(), 190, 125);
addTextField(this, 4, colorR2TextField, surface.getColorR2(), 190, 125);
addTextField(this, 5, colorG2TextField, surface.getColorG2(), 190, 125);
addTextField(this, 6, colorB2TextField, surface.getColorB2(), 190, 125);
addTextField(this, 7, textureNameTextField, surface.getTextureName(), 190, 220);
add(getTextureTypeComboBox(), null);
getTextureTypeComboBox().setSelectedItem(toNoneString(surface.getTextureType()));
addTextField(this, 9, textureSizeTextField, surface.getTextureSize(), 190, 100);
addTextField(this, 9, textureSizeTextField, surface.getTextureSize(), 190, 125);
add(getTextureLinkWithPreviousComboBox(), null);
getTextureLinkWithPreviousComboBox().setSelectedItem(toNoneString(surface.getTextureLinkWithPrevious()));
add(getTextureStartOnBoundaryComboBox(), null);
getTextureStartOnBoundaryComboBox().setSelectedItem(toNoneString(surface.getTextureStartOnBoundary()));
addTextField(this, 12, textureMipMapTextField, surface.getTextureMipMap(), 190, 100);
addTextField(this, 13, frictionTextField, surface.getFriction(), 190, 100);
addTextField(this, 14, rollingResistanceTextField, surface.getRollingResistance(), 190, 100);
addTextField(this, 12, textureMipMapTextField, surface.getTextureMipMap(), 190, 125);
addTextField(this, 13, frictionTextField, surface.getFriction(), 190, 125);
addTextField(this, 14, rollingResistanceTextField, surface.getRollingResistance(), 190, 125);
addTextField(this, 15, bumpNameTextField, surface.getBumpName(), 190, 220);
addTextField(this, 16, bumpSizeTextField, surface.getBumpSize(), 190, 100);
addTextField(this, 17, roughnessTextField, surface.getRoughness(), 190, 100);
addTextField(this, 18, roughnessWavelengthTextField, surface.getRoughnessWavelength(), 190, 100);
addTextField(this, 16, bumpSizeTextField, surface.getBumpSize(), 190, 125);
addTextField(this, 17, roughnessTextField, surface.getRoughness(), 190, 125);
addTextField(this, 18, roughnessWavelengthTextField, surface.getRoughnessWavelength(), 190, 125);
addTextField(this, 19, racelineNameTextField, surface.getRacelineName(), 190, 220);
addTextField(this, 20, damageTextField, surface.getDammage(), 190, 100);
addTextField(this, 21, reboundTextField, surface.getRebound(), 190, 100);
addTextField(this, 20, damageTextField, surface.getDammage(), 190, 125);
addTextField(this, 21, reboundTextField, surface.getRebound(), 190, 125);
if (defaultSurfaces)
{
@ -380,7 +380,7 @@ public class SurfaceProperties extends PropertyPanel
{
String[] items = {"none", "discrete", "continuous"};
textureTypeComboBox = new JComboBox<String>(items);
textureTypeComboBox.setBounds(190, 226, 120, 23);
textureTypeComboBox.setBounds(190, 226, 125, 23);
}
return textureTypeComboBox;
}
@ -391,7 +391,7 @@ public class SurfaceProperties extends PropertyPanel
{
String[] items = {"none", "yes", "no"};
textureLinkWithPreviousComboBox = new JComboBox<String>(items);
textureLinkWithPreviousComboBox.setBounds(190, 280, 120, 23);
textureLinkWithPreviousComboBox.setBounds(190, 280, 125, 23);
}
return textureLinkWithPreviousComboBox;
}
@ -402,7 +402,7 @@ public class SurfaceProperties extends PropertyPanel
{
String[] items = {"none", "yes", "no"};
textureStartOnBoundaryComboBox = new JComboBox<String>(items);
textureStartOnBoundaryComboBox.setBounds(190, 307, 120, 23);
textureStartOnBoundaryComboBox.setBounds(190, 307, 125, 23);
}
return textureStartOnBoundaryComboBox;
}

16
src/tools/trackeditor/gui/properties/TerrainProperties.java
View file

@ -127,16 +127,16 @@ public class TerrainProperties extends PropertyPanel
addLabel(this, 9, reliefFileLabel, "Reliefe File", 120);
addLabel(this, 10, surfaceLabel, "Surface", 120);
addTextField(this, 0, trackStepTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getTrackStep(), 140, 100);
addTextField(this, 1, borderMarginTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getBorderMargin(), 140, 100);
addTextField(this, 2, borderStepTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getBorderStep(), 140, 100);
addTextField(this, 3, borderHeightTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getBorderHeight(), 140, 100);
addTextField(this, 0, trackStepTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getTrackStep(), 140, 125);
addTextField(this, 1, borderMarginTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getBorderMargin(), 140, 125);
addTextField(this, 2, borderStepTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getBorderStep(), 140, 125);
addTextField(this, 3, borderHeightTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getBorderHeight(), 140, 125);
this.add(getOrientationComboBox(), null);
addTextField(this, 5, maximumAltitudeTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getMaximumAltitude(), 140, 100);
addTextField(this, 6, minimumAltitudeTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getMinimumAltitude(), 140, 100);
addTextField(this, 7, groupSizeTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getGroupSize(), 140, 100);
addTextField(this, 5, maximumAltitudeTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getMaximumAltitude(), 140, 125);
addTextField(this, 6, minimumAltitudeTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getMinimumAltitude(), 140, 125);
addTextField(this, 7, groupSizeTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getGroupSize(), 140, 125);
addTextField(this, 8, elevationMapTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getElevationMap(), 140, 295);
addTextField(this, 9, reliefFileTextField, getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getReliefFile(), 140, 295);
@ -162,7 +162,7 @@ public class TerrainProperties extends PropertyPanel
String[] items =
{"none", "clockwise", "counter-clockwise"};
orientationComboBox = new JComboBox<String>(items);
orientationComboBox.setBounds(140, 118, 120, 23);
orientationComboBox.setBounds(140, 118, 125, 23);
String orientation = getEditorFrame().getTrackData().getGraphic().getTerrainGeneration().getOrientation();
if (orientation == null || orientation.isEmpty())
orientation = "none";

24
src/tools/trackeditor/gui/properties/TrackLightProperties.java
View file

@ -216,20 +216,20 @@ public class TrackLightProperties extends PropertyPanel
addLabel(this, 12, greenLabel, "Green", 160);
addLabel(this, 13, blueLabel, "Blue", 160);
addTextField(this, 0, nameTextField, light.getName(), 120, 100);
addTextField(this, 1, roleTextField, light.getRole(), 120, 100);
addTextField(this, 2, topLeftXTextField, light.getTopLeftX(), 120, 100);
addTextField(this, 3, topLeftYTextField, light.getTopLeftY(), 120, 100);
addTextField(this, 4, topLeftZTextField, light.getTopLeftZ(), 120, 100);
addTextField(this, 5, bottomRightXTextField, light.getBottomRightX(), 120, 100);
addTextField(this, 6, bottomRightYTextField, light.getBottomRightY(), 120, 100);
addTextField(this, 7, bottomRightZTextField, light.getBottomRightZ(), 120, 100);
addTextField(this, 0, nameTextField, light.getName(), 120, 125);
addTextField(this, 1, roleTextField, light.getRole(), 120, 125);
addTextField(this, 2, topLeftXTextField, light.getTopLeftX(), 120, 125);
addTextField(this, 3, topLeftYTextField, light.getTopLeftY(), 120, 125);
addTextField(this, 4, topLeftZTextField, light.getTopLeftZ(), 120, 125);
addTextField(this, 5, bottomRightXTextField, light.getBottomRightX(), 120, 125);
addTextField(this, 6, bottomRightYTextField, light.getBottomRightY(), 120, 125);
addTextField(this, 7, bottomRightZTextField, light.getBottomRightZ(), 120, 125);
addTextField(this, 8, textureOnTextField, light.getTextureOn(), 120, 290);
addTextField(this, 9, textureOffTextField, light.getTextureOff(), 120, 290);
addTextField(this, 10, indexTextField, light.getIndex(), 120, 100);
addTextField(this, 11, redTextField, light.getRed(), 120, 100);
addTextField(this, 12, greenTextField, light.getGreen(), 120, 100);
addTextField(this, 13, blueTextField, light.getBlue(), 120, 100);
addTextField(this, 10, indexTextField, light.getIndex(), 120, 125);
addTextField(this, 11, redTextField, light.getRed(), 120, 125);
addTextField(this, 12, greenTextField, light.getGreen(), 120, 125);
addTextField(this, 13, blueTextField, light.getBlue(), 120, 125);
add(getTextureOnButton(), null);
add(getTextureOffButton(), null);

30
src/tools/trackeditor/gui/properties/TrackProperties.java
View file

@ -143,15 +143,15 @@ public class TrackProperties extends PropertyPanel
addLabel(this, 5, racelineIntLabel, "Raceline Int", 140);
addLabel(this, 6, racelineExtLabel, "Raceline Ext", 140);
addTextField(this, 0, widthTextField, getEditorFrame().getTrackData().getMainTrack().getWidth(), 150, 50);
addTextField(this, 0, widthTextField, getEditorFrame().getTrackData().getMainTrack().getWidth(), 150, 125);
this.add(getSurfaceComboBox(), null);
this.add(getProfilComboBox(), null);
addTextField(this, 3, profilStepsLengthTextField, getEditorFrame().getTrackData().getMainTrack().getProfilStepsLength(), 150, 50);
addTextField(this, 4, racelineWidthscaleTextField, getEditorFrame().getTrackData().getMainTrack().getRacelineWidthscale(), 150, 50);
addTextField(this, 5, racelineIntTextField, getEditorFrame().getTrackData().getMainTrack().getRacelineInt(), 150, 50);
addTextField(this, 6, racelineExtTextField, getEditorFrame().getTrackData().getMainTrack().getRacelineExt(), 150, 50);
addTextField(this, 3, profilStepsLengthTextField, getEditorFrame().getTrackData().getMainTrack().getProfilStepsLength(), 150, 125);
addTextField(this, 4, racelineWidthscaleTextField, getEditorFrame().getTrackData().getMainTrack().getRacelineWidthscale(), 150, 125);
addTextField(this, 5, racelineIntTextField, getEditorFrame().getTrackData().getMainTrack().getRacelineInt(), 150, 125);
addTextField(this, 6, racelineExtTextField, getEditorFrame().getTrackData().getMainTrack().getRacelineExt(), 150, 125);
this.add(getTabbedPane(), null);
}
@ -233,7 +233,7 @@ public class TrackProperties extends PropertyPanel
{
String[] items = {"none", "linear", "spline"};
profilComboBox = new JComboBox<String>(items);
profilComboBox.setBounds(150, 64, 100, 23);
profilComboBox.setBounds(150, 64, 125, 23);
String profil = getEditorFrame().getTrackData().getMainTrack().getProfil();
if (profil == null || profil.isEmpty())
profil = "none";
@ -319,20 +319,20 @@ public class TrackProperties extends PropertyPanel
addLabel(this, 10, barrierSurfaceLabel, "Barrier Surface", 140);
addLabel(this, 11, barrierStyleLabel, "Barrier Style", 140);
addTextField(this, 0, sideStartWidthTextField, side.getSideStartWidth(), 150, 60);
addTextField(this, 1, sideEndWidthTextField, side.getSideEndWidth(), 150, 60);
addTextField(this, 0, sideStartWidthTextField, side.getSideStartWidth(), 150, 125);
addTextField(this, 1, sideEndWidthTextField, side.getSideEndWidth(), 150, 125);
add(getSideSurfaceComboBox(), null);
add(getSideBankingTypeComboBox(), null);
addTextField(this, 4, borderWidthTextField, side.getBorderWidth(), 150, 60);
addTextField(this, 5, borderHeightTextField, side.getBorderHeight(), 150, 60);
addTextField(this, 4, borderWidthTextField, side.getBorderWidth(), 150, 125);
addTextField(this, 5, borderHeightTextField, side.getBorderHeight(), 150, 125);
add(getBorderSurfaceComboBox(), null);
add(getBorderStyleComboBox(), null);
addTextField(this, 8, barrierWidthTextField, side.getBarrierWidth(), 150, 60);
addTextField(this, 9, barrierHeightTextField, side.getBarrierHeight(), 150, 60);
addTextField(this, 8, barrierWidthTextField, side.getBarrierWidth(), 150, 125);
addTextField(this, 9, barrierHeightTextField, side.getBarrierHeight(), 150, 125);
add(getBarrierSurfaceComboBox(), null);
add(getBarrierStyleComboBox(), null);
@ -374,7 +374,7 @@ public class TrackProperties extends PropertyPanel
{
String[] items = {"none", "level", "tangent"};
sideBankingTypeComboBox = new JComboBox<String>();
sideBankingTypeComboBox.setBounds(150, 91, 100, 23);
sideBankingTypeComboBox.setBounds(150, 91, 125, 23);
sideBankingTypeComboBox.setModel(new DefaultComboBoxModel<String>(items));
String type = side.getSideBankingType();
if (type == null || type.isEmpty())
@ -429,7 +429,7 @@ public class TrackProperties extends PropertyPanel
if (borderStyleComboBox == null)
{
borderStyleComboBox = new JComboBox<String>();
borderStyleComboBox.setBounds(150, 199, 100, 23);
borderStyleComboBox.setBounds(150, 199, 125, 23);
borderStyleComboBox.setModel(new DefaultComboBoxModel<String>(borderStyleItems));
String style = side.getBorderStyle();
if (style == null || style.isEmpty())
@ -484,7 +484,7 @@ public class TrackProperties extends PropertyPanel
if (barrierStyleComboBox == null)
{
barrierStyleComboBox = new JComboBox<String>();
barrierStyleComboBox.setBounds(150, 307, 100, 23);
barrierStyleComboBox.setBounds(150, 307, 125, 23);
barrierStyleComboBox.setModel(new DefaultComboBoxModel<String>(barrierStyleItems));
String style = side.getBarrierStyle();
if (style == null || style.isEmpty())

8
src/tools/trackeditor/gui/properties/TurnMarksProperties.java
View file

@ -70,10 +70,10 @@ public class TurnMarksProperties extends PropertyPanel
addLabel(this, 2, verticalSpaceLabel, "Vertical Space", 120);
addLabel(this, 3, horizontalSpaceLabel, "Horizontal Space", 120);
addTextField(this, 0, widthTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getWidth(), 130, 100);
addTextField(this, 1, heightTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getHeight(), 130, 100);
addTextField(this, 2, verticalSpaceTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getVerticalSpace(), 130, 100);
addTextField(this, 3, horizontalSpaceTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getHorizontalSpace(), 130, 100);
addTextField(this, 0, widthTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getWidth(), 130, 125);
addTextField(this, 1, heightTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getHeight(), 130, 125);
addTextField(this, 2, verticalSpaceTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getVerticalSpace(), 130, 125);
addTextField(this, 3, horizontalSpaceTextField, getEditorFrame().getTrackData().getGraphic().getTurnMarks().getHorizontalSpace(), 130, 125);
add(getDefaultButton(), null);
add(getDeleteButton(), null);