[Slbh-commits] SF.net SVN: slbh:[2] trunk/src/slbh
Status: Inactive
Brought to you by:
surivorp
Menu
▾
▴
[Slbh-commits] SF.net SVN: slbh:[2] trunk/src/slbh
|
From: <sur...@us...> - 2009-08-01 22:33:15
|
Revision: 2
http://slbh.svn.sourceforge.net/slbh/?rev=2&view=rev
Author: surivorp
Date: 2009-08-01 22:33:06 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------
No more need to edit the script to do a babel tour. Can now set the repeat propertie in the options and the generated script will have the loop.
Modified Paths:
--------------
trunk/src/slbh/conf/Configuration.java
trunk/src/slbh/gui/Options.java
trunk/src/slbh/gui/Properties.java
trunk/src/slbh/gui/Viewport.java
trunk/src/slbh/lang/English.java
trunk/src/slbh/lang/French.java
trunk/src/slbh/lang/Language.java
Modified: trunk/src/slbh/conf/Configuration.java
===================================================================
--- trunk/src/slbh/conf/Configuration.java 2009-07-22 01:44:26 UTC (rev 1)
+++ trunk/src/slbh/conf/Configuration.java 2009-08-01 22:33:06 UTC (rev 2)
@@ -57,7 +57,7 @@
objects.add(new Object(name, pos, rotation));
}
- public String ToSLScript(int high) {
+ public String ToSLScript(int high, int repeat) {
String result = objectsConf;
result += "integer live = 60;\n\n";
result += "integer i;\n";
@@ -68,8 +68,17 @@
result += "\ttouch (integer param) {\n";
result += "\t\tllSetAlpha(0, ALL_SIDES);\n";
+ if (repeat > 1) {
+ result += "\n\t\tinteger r;\n";
+ result += "\t\tfor(r=0; r<" + repeat + "; r++) {\n\n";
+ }
+
result += CodeCreator.Entry(objects, high);
+ if (repeat > 1) {
+ result += "\n\t\t}\n\n";
+ }
+
result += "\t\tllDie();\n";
result += "\t}\n";
result += "}";
Modified: trunk/src/slbh/gui/Options.java
===================================================================
--- trunk/src/slbh/gui/Options.java 2009-07-22 01:44:26 UTC (rev 1)
+++ trunk/src/slbh/gui/Options.java 2009-08-01 22:33:06 UTC (rev 2)
@@ -55,7 +55,7 @@
slbh.conf.Configuration myConf = myViewport.createScene();
// Show
- ViewLSL v = new ViewLSL(myConf.ToSLScript((int) myViewport.getDeltaZ()*100*myViewport.numberOfFloors()));
+ ViewLSL v = new ViewLSL(myConf.ToSLScript((int) myViewport.getDeltaZ()*100*myViewport.numberOfFloors(), myViewport.getRepeat()));
v.setVisible(true);
return;
}
Modified: trunk/src/slbh/gui/Properties.java
===================================================================
--- trunk/src/slbh/gui/Properties.java 2009-07-22 01:44:26 UTC (rev 1)
+++ trunk/src/slbh/gui/Properties.java 2009-08-01 22:33:06 UTC (rev 2)
@@ -12,6 +12,7 @@
public class Properties extends JFrame implements ActionListener{
private JTextField deltaXY = new JTextField();
private JTextField deltaZ = new JTextField();
+ private JTextField repeat = new JTextField();
private Viewport myViewport;
private JButton bOk = new JButton("OK");
private JButton bCancel = new JButton(slbh.lang.Config.getMyLanguage().buttonCancel());
@@ -21,19 +22,22 @@
// Set the window
setTitle("Properties");
- setSize(200, 200);
+ setSize(500, 200);
setLayout(new FlowLayout());
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
// Set the components
deltaXY.setText(String.valueOf(myViewport.getDeltaXY()));
deltaZ.setText(String.valueOf(myViewport.getDeltaZ()));
+ repeat.setText(String.valueOf(myViewport.getRepeat()));
// Add the components
add(new JLabel(slbh.lang.Config.getMyLanguage().propertiesDeltaXY()));
add(deltaXY);
add(new JLabel(slbh.lang.Config.getMyLanguage().propertiesDeltaZ()));
add(deltaZ);
+ add(new JLabel(slbh.lang.Config.getMyLanguage().propertiesRepeat()));
+ add(repeat);
add(bOk);
add(bCancel);
@@ -45,8 +49,10 @@
}
public void actionPerformed(ActionEvent arg0) {
- if (arg0.getActionCommand().compareTo("ok") == 0)
+ if (arg0.getActionCommand().compareTo("ok") == 0) {
myViewport.changeDelta(Double.valueOf(deltaXY.getText()).doubleValue(), Double.valueOf(deltaZ.getText()).doubleValue());
+ myViewport.setRepeat(Integer.valueOf(repeat.getText()));
+ }
dispose();
}
Modified: trunk/src/slbh/gui/Viewport.java
===================================================================
--- trunk/src/slbh/gui/Viewport.java 2009-07-22 01:44:26 UTC (rev 1)
+++ trunk/src/slbh/gui/Viewport.java 2009-08-01 22:33:06 UTC (rev 2)
@@ -24,6 +24,7 @@
private double deltaXY;
private double deltaZ;
private int currentFloor;
+ private int repeat;
public Viewport() {
init();
@@ -302,6 +303,7 @@
zoom = 20;
deltaXY = 2;
deltaZ = 3;
+ repeat = 1;
currentFloor = 0;
startPosition[0] = 0;
startPosition[1] = 0;
@@ -393,6 +395,10 @@
deltaXY = Double.valueOf(parts[0]).doubleValue();
deltaZ = Double.valueOf(parts[1]).doubleValue();
+ // Repeat
+ nextLine = myReader.readLine();
+ repeat = Integer.valueOf(nextLine);
+
// Get the objects
while ( (nextLine = myReader.readLine()) != null) {
// Check if new floor
@@ -520,6 +526,9 @@
// Deltas
result += deltaXY + " " + deltaZ + "\n";
+ // Repeat
+ result += repeat + "\n";
+
// Objects
for (int i=0; i<floors.size(); i++) {
result += "-\n";
@@ -532,4 +541,12 @@
return result;
}
+
+ public int getRepeat() {
+ return repeat;
+ }
+
+ public void setRepeat(int repeat) {
+ this.repeat = repeat;
+ }
}
Modified: trunk/src/slbh/lang/English.java
===================================================================
--- trunk/src/slbh/lang/English.java 2009-07-22 01:44:26 UTC (rev 1)
+++ trunk/src/slbh/lang/English.java 2009-08-01 22:33:06 UTC (rev 2)
@@ -24,4 +24,5 @@
public String objectWall() {return "Wall";}
public String propertiesDeltaXY() {return "Width (m)";}
public String propertiesDeltaZ() {return "Height (m)";}
+ public String propertiesRepeat() {return "Repeat the structure (babel tour)";}
}
Modified: trunk/src/slbh/lang/French.java
===================================================================
--- trunk/src/slbh/lang/French.java 2009-07-22 01:44:26 UTC (rev 1)
+++ trunk/src/slbh/lang/French.java 2009-08-01 22:33:06 UTC (rev 2)
@@ -24,4 +24,5 @@
public String objectWall() {return "Mur";}
public String propertiesDeltaXY() {return "Largeur (m)";}
public String propertiesDeltaZ() {return "Hauteur (m)";}
+ public String propertiesRepeat() {return "R\xE9p\xE9ter la figure (tour de babel)";}
}
Modified: trunk/src/slbh/lang/Language.java
===================================================================
--- trunk/src/slbh/lang/Language.java 2009-07-22 01:44:26 UTC (rev 1)
+++ trunk/src/slbh/lang/Language.java 2009-08-01 22:33:06 UTC (rev 2)
@@ -24,4 +24,5 @@
public String objectWall();
public String propertiesDeltaXY();
public String propertiesDeltaZ();
+ public String propertiesRepeat();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
