r3663 - trunk/tools/ImgToMap/src/imgtomap

savagex at icculus.org savagex at icculus.org
Sun May 25 08:32:32 EDT 2008


Author: savagex
Date: 2008-05-25 08:32:27 -0400 (Sun, 25 May 2008)
New Revision: 3663

Modified:
   trunk/tools/ImgToMap/src/imgtomap/JFrameMain.form
   trunk/tools/ImgToMap/src/imgtomap/JFrameMain.java
   trunk/tools/ImgToMap/src/imgtomap/MapWriter.java
Log:
adjust some default values. Set gridsize and blocksize to values fitting terrain maps.

Modified: trunk/tools/ImgToMap/src/imgtomap/JFrameMain.form
===================================================================
--- trunk/tools/ImgToMap/src/imgtomap/JFrameMain.form	2008-05-25 11:20:52 UTC (rev 3662)
+++ trunk/tools/ImgToMap/src/imgtomap/JFrameMain.form	2008-05-25 12:32:27 UTC (rev 3663)
@@ -152,7 +152,6 @@
                                   <Component id="jCheckBoxDetail" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace type="separate" max="-2" attributes="0"/>
                                   <Component id="jCheckBoxVisBlocker" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace max="-2" attributes="0"/>
                               </Group>
                               <Group type="102" alignment="0" attributes="0">
                                   <Group type="103" groupAlignment="1" attributes="0">
@@ -231,7 +230,7 @@
         <Component class="javax.swing.JSpinner" name="jSpinnerHeight">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="1024" maximum="16384" minimum="256" numberType="java.lang.Integer" stepSize="1" type="number"/>
+              <SpinnerModel initial="2048" maximum="16384" minimum="256" numberType="java.lang.Integer" stepSize="1" type="number"/>
             </Property>
           </Properties>
           <Events>
@@ -241,7 +240,7 @@
         <Component class="javax.swing.JSpinner" name="jSpinnerTextureScale">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="0.5" maximum="16.0" minimum="0.25" numberType="java.lang.Double" stepSize="0.25" type="number"/>
+              <SpinnerModel initial="1.0" maximum="16.0" minimum="0.25" numberType="java.lang.Double" stepSize="0.25" type="number"/>
             </Property>
           </Properties>
         </Component>
@@ -339,7 +338,7 @@
         <Component class="javax.swing.JSpinner" name="jSpinnerSkyHeight">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="1152" minimum="256" numberType="java.lang.Integer" stepSize="1" type="number"/>
+              <SpinnerModel initial="2048" minimum="256" numberType="java.lang.Integer" stepSize="1" type="number"/>
             </Property>
           </Properties>
           <Events>

Modified: trunk/tools/ImgToMap/src/imgtomap/JFrameMain.java
===================================================================
--- trunk/tools/ImgToMap/src/imgtomap/JFrameMain.java	2008-05-25 11:20:52 UTC (rev 3662)
+++ trunk/tools/ImgToMap/src/imgtomap/JFrameMain.java	2008-05-25 12:32:27 UTC (rev 3663)
@@ -129,14 +129,14 @@
 
         jSpinnerUnits.setModel(new javax.swing.SpinnerNumberModel(256, 1, 2048, 1));
 
-        jSpinnerHeight.setModel(new javax.swing.SpinnerNumberModel(1024, 256, 16384, 1));
+        jSpinnerHeight.setModel(new javax.swing.SpinnerNumberModel(2048, 256, 16384, 1));
         jSpinnerHeight.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 jSpinnerHeightStateChanged(evt);
             }
         });
 
-        jSpinnerTextureScale.setModel(new javax.swing.SpinnerNumberModel(0.5d, 0.25d, 16.0d, 0.25d));
+        jSpinnerTextureScale.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.25d, 16.0d, 0.25d));
 
         jLabel4.setText("Texture scale:");
 
@@ -163,8 +163,7 @@
                             .add(jPanel2Layout.createSequentialGroup()
                                 .add(jCheckBoxDetail)
                                 .add(18, 18, 18)
-                                .add(jCheckBoxVisBlocker)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
+                                .add(jCheckBoxVisBlocker))
                             .add(jPanel2Layout.createSequentialGroup()
                                 .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                                     .add(jLabel1)
@@ -214,7 +213,7 @@
 
         jLabel5.setText("Sky height:");
 
-        jSpinnerSkyHeight.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(1152), Integer.valueOf(256), null, Integer.valueOf(1)));
+        jSpinnerSkyHeight.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(2048), Integer.valueOf(256), null, Integer.valueOf(1)));
         jSpinnerSkyHeight.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 jSpinnerSkyHeightStateChanged(evt);

Modified: trunk/tools/ImgToMap/src/imgtomap/MapWriter.java
===================================================================
--- trunk/tools/ImgToMap/src/imgtomap/MapWriter.java	2008-05-25 11:20:52 UTC (rev 3662)
+++ trunk/tools/ImgToMap/src/imgtomap/MapWriter.java	2008-05-25 12:32:27 UTC (rev 3663)
@@ -43,6 +43,8 @@
 
         // worldspawn start
         pw.print("{\n\"classname\" \"worldspawn\"\n");
+        pw.print("\n\"gridsize\" \"128 128 256\"\n");
+        pw.print("\n\"blocksize\" \"2048 2048 2048\"\n");
 
         double xmax = (columns.length - 1) * units;
         double ymax = (columns[0].length - 1) * units;




More information about the nexuiz-commits mailing list