Changeset 1847

Timestamp:

11/06/08 00:28:56 (2 months ago)

Author:

ddb174

Message:

All Sdb files are now parsed to a lower level; the Count9 subtype is now fully parsed along with the Count10 and Count11 subtypes. The 3ds exporter can now export textures and UVs(though we still can't figure out the correct texture from the game nor the UVs, this requires more Sdb knowledge). Some progress on extracting the room list for each Age.

Files:

• drizzle/DrizzlePrp/src/automation/realmyst.java (modified) (4 diffs)
• drizzle/DrizzlePrp/src/export3ds/AAA_Template.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/export3ds/Material.java (modified) (3 diffs)
• drizzle/DrizzlePrp/src/export3ds/NamedTriangleObject.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/export3ds/TextureFilename.java (added)
• drizzle/DrizzlePrp/src/export3ds/TextureMap.java (added)
• drizzle/DrizzlePrp/src/export3ds/Typeid.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/export3ds/UvVerts.java (added)
• drizzle/DrizzlePrp/src/filesearcher (added)
• drizzle/DrizzlePrp/src/filesearcher/search.java (added)
• drizzle/DrizzlePrp/src/gui/Gui.form (modified) (1 diff)
• drizzle/DrizzlePrp/src/gui/Gui.java (modified) (4 diffs)
• drizzle/DrizzlePrp/src/realmyst/Count10.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/realmyst/Count11.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/realmyst/Count2Undone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Count3Undone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Count4Undone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Count5Undone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Count6Undone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Count7Undone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Count8Undone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Count9.java (modified) (3 diffs)
• drizzle/DrizzlePrp/src/realmyst/CountAUndone.java (added)
• drizzle/DrizzlePrp/src/realmyst/Mdb.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/realmyst/Sdb.java (modified) (8 diffs)
• drizzle/DrizzlePrp/src/realmyst/TaggedObj.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/realmyst/Typeid.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/realmyst/Vdb.java (added)
• drizzle/DrizzlePrp/src/shared/FltPair.java (added)
• drizzle/DrizzlePrp/src/shared/IBytestream.java (modified) (2 diffs)

drizzle/DrizzlePrp/src/automation/realmyst.java

@@ -39 +39 @@
-        main.meshdata.mat = Material.create("defaultmat");
-        
+        //add texture filename...
+        main.meshdata.mat.texturemap = TextureMap.create("active.hsm.dds");
+        
-        for(Mdb mdb: mdbs)
-        {
@@ -69 +72 @@
-        }*/
-        
-
-
-
+
+
+
+
+
+
-        
-        Vertex[] verts = new Vertex[mdb.fs.length];
@@ -94 +100 @@
-
-        String objname = mdb.name.toString();
+        
+        FltPair[] uvcoords = new FltPair[mdb.trips.length];
+        for(int i=0;i<mdb.trips.length;i++)
+        {
+            Flt u = mdb.trips[i].x;
+            Flt v = mdb.trips[i].y;
+            uvcoords[i] = FltPair.createFromFlts(u, v);
+        }
-
-        //if(main==null)
@@ -104 +118 @@
-        newobj.namedTriangleObject.points = PointArray.create(verts);
-        newobj.namedTriangleObject.faces = FaceArray.create(faces, "defaultmat");
+        //if(uvcoords.length!=0) newobj.namedTriangleObject.uvcoords = UvVerts.create(uvcoords);
-        //main.meshdata.objs.add(newobj);
+        
+        for(ShortTriplet face: faces)
+        {
+            if(face.p >= verts.length || face.q>= verts.length || face.r>=verts.length)
+            {
+                int dummy=0;
+            }
+        }
+        if(uvcoords.length!=0)
+        {
+            if(uvcoords.length!=verts.length)
+            {
+                int dummy=0;
+            }
+            else
+            {
+                if(uvcoords.length!=0) newobj.namedTriangleObject.uvcoords = UvVerts.create(uvcoords);
+                
+            }
+        }
-
-        //IBytedeque out = new Bytedeque2();

drizzle/DrizzlePrp/src/export3ds/AAA_Template.java

@@ -8 +8 @@
-import shared.*;
-
-
+ extends tdsobj
-{
-    
@@ -20 +20 @@
-    }
-    
+    public Typeid type(){throw new uncaughtexception("implement this.");}
+
+    public void innercompile(IBytedeque c)
+    {
+        throw new uncaughtexception("implement this.");
+    }
+    
-}

drizzle/DrizzlePrp/src/export3ds/Material.java

@@ -15 +15 @@
-    public MatSpecular specular;
-    
+    public TextureMap texturemap;
+    
-    private Material(){}
-    
@@ -25 +27 @@
-        result.diffuse = MatDiffuse.create((byte)204,(byte)204,(byte)204);
-        result.specular = MatSpecular.create((byte)255,(byte)255,(byte)255);
+        result.texturemap = null;
-        return result;
-    }
@@ -34 +37 @@
-        diffuse.compile(c);
-        specular.compile(c);
+        if(texturemap!=null) texturemap.compile(c);
-    }
-}

drizzle/DrizzlePrp/src/export3ds/NamedTriangleObject.java

@@ -13 +13 @@
-    public FaceArray faces;
-    
+    public UvVerts uvcoords;
+    
-    private NamedTriangleObject(){}
-    
@@ -25 +27 @@
-        points.compile(c);
-        faces.compile(c);
+        if(uvcoords!=null) uvcoords.compile(c);
-    }
-}

drizzle/DrizzlePrp/src/export3ds/Typeid.java

@@ -26 +26 @@
-    facearray,
-    meshmatgroup,
+    texturemap,
+    texturefilename,
+    uvcoords,
-    ;
-    public static pair[] pairs = {
@@ -43 +46 @@
-        p((short)0x4120, facearray),
-        p((short)0x4130, meshmatgroup),
+        p((short)0x4140, uvcoords),
+        p((short)0xa200, texturemap),
+        p((short)0xa300, texturefilename),
-    };
-    

drizzle/DrizzlePrp/src/gui/Gui.form

@@ -2925 +2925 @@
-              </Constraints>
-            </Component>
+            <Component class="javax.swing.JButton" name="jButton109">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="string search"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton109ActionPerformed"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="680" y="60" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
-          </SubComponents>
-        </Container>

drizzle/DrizzlePrp/src/gui/Gui.java

@@ -578 +578 @@
-        jButton106 = new javax.swing.JButton();
-        jButton108 = new javax.swing.JButton();
+        jButton109 = new javax.swing.JButton();
-        jPanel12 = new javax.swing.JPanel();
-        jButton50 = new javax.swing.JButton();
@@ -2469 +2470 @@
-                jButton108.setBounds(410, 120, 72, 36);
-
+                jButton109.setText("string search");
+                jButton109.addActionListener(new java.awt.event.ActionListener() {
+                    public void actionPerformed(java.awt.event.ActionEvent evt) {
+                        jButton109ActionPerformed(evt);
+                    }
+                });
+                jPanel10.add(jButton109);
+                jButton109.setBounds(680, 60, 96, 36);
+
-                tabsState3.addTab("realMyst", jPanel10);
-
@@ -4173 +4183 @@
-
-}//GEN-LAST:event_jButton108ActionPerformed
+
+private void jButton109ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton109ActionPerformed
+    String folder = "G:/prps/realmysttest2/sdb";
+    String[] searchstrs = {
+        //6910138.vdb
+        //"channelwood",
+        //"ch_bookroom",
+        //"channel_temple",
+        //"windmill",
+        //"ch_sirrus01",
+        //"ch_waterhut01",
+        //"ch_cylinder_f",
+        //"ch_achenar01",
+        
+        //85660192.vdb
+        //"me_achenar02",
+        //"me_achenar01",
+        //"me_pass02",
+        //"mech_indoor",
+        //"me_bookroom",
+        //"mech_outdoor",
+        //"me_conpane",
+        
+        "se_stair04",
+        "selenitic",
+        "se_stair03",
+        "se_stair02",
+        
+        //"cabin",
+        //"treegate",
+        //"rocket",
+        //"fireplace",
+        
+        ////"stoneship01",
+        ////"sn_island_laboratory",
+        //"snowage",
+        //"aurora",
+        
+        //"sship_aku_room",
+        //"ss_akk04",
+        //"ss_deep_sea",
+        //"compus_room",
+        //"sship_tunnel",
+        //"lighthouse",
+    };
+    Vector<File> files = filesearcher.search.getallfiles(folder, false);
+    for(File f: files)
+    {
+        boolean allfound = filesearcher.search.searchForStrings(f, searchstrs);
+        if(allfound)
+        {
+            String filename = f.getName();
+            int dummy=0;
+        }
+    }
+}//GEN-LAST:event_jButton109ActionPerformed
-    
-/*class c2 extends javax.swing.DefaultListSelectionModel
@@ -4245 +4311 @@
-    private javax.swing.JButton jButton107;
-    private javax.swing.JButton jButton108;
+    private javax.swing.JButton jButton109;
-    private javax.swing.JButton jButton11;
-    private javax.swing.JButton jButton12;

drizzle/DrizzlePrp/src/realmyst/Count10.java

@@ -24 +24 @@
-{
-    //int tag;
-
+public 
-    int size;
-    int sub1;
@@ -170 +170 @@
-            int u4 = c.readInt(); e.ensure(u4,0,1,4,6,7,5,37837212);
-            int count = c.readInt(); //e.ensure(u5,2);
-
-
-
-
-
-
+
+
+
+
+
+
+
-            /*int u6 = c.readInt(); e.ensure(u6,0);
-            int u7 = c.readInt(); e.ensure(u7,1);

drizzle/DrizzlePrp/src/realmyst/Count11.java

@@ -48 +48 @@
-            {
-                m.msg("reading extra int and flt");
-
+,10
-                Flt f1 = new Flt(c); //0.5
-                int dummy=0;

drizzle/DrizzlePrp/src/realmyst/Count9.java

@@ -33 +33 @@
-        Bstr s1 = new Bstr(c);
-        byte b1 = c.readByte(); e.ensure((int)b1,15);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        int u9 = c.readInt();
-        //Bstr s2 = new Bstr(c);
@@ -52 +54 @@
-            //int u11 = c.readInt(); e.ensure(u11,1001); //3
-            //Typeid reftype = Typeid.read(c);
-
+
+
-            //if(reftype==Typeid.ref)
-            //{
@@ -109 +112 @@
-        public Ref2(IBytestream c)
-        {
-
+
+
+
+
-            int u1 = c.readInt(); e.ensure(u1,0);
-            int u2 = c.readInt(); e.ensure(u2,1);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-            //int strcount = c.readInt();

drizzle/DrizzlePrp/src/realmyst/Mdb.java

@@ -35 +35 @@
-    IntsFullIndex ifi;
-    public wha[] whas;
+    public Vertex[] trips;
-    
-    
-    static Primary main;
-
+
+
+
+
-    public Mdb(IBytestream c, String fntrap)
-    {
@@ -116 +120 @@
-
-            int u21 = c.readInt(); //e.ensure(u21,0);
-Vertex[] 
+
-        }
-        

drizzle/DrizzlePrp/src/realmyst/Sdb.java

@@ -20 +20 @@
-    public Bstr[] strs;
-    
+    public Count10[] count10s    ;
+    
-    public Sdb(IBytestream c)
-    {
-
+
+
-                //"113499986.vdb"
-                //"14341445.vdb"
-
+
+
+
-                ;
-
-
-
+
+
+
+
+
+
+
-        }
-        
@@ -35 +44 @@
-        
-        tag = c.readInt();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            int hasThing = c.readInt();
-            if(hasThing!=0)
-            {
-
-
+
-            }
-            int count4 = c.readInt(); //v78
-            if(count4!=0)
-            {
-
-
+
-            }
-
-
-
+
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                {
-          &nbs