Changeset 1887

Timestamp:

11/18/08 02:09:13 (2 months ago)

Author:

ddb174

Message:

Improved realMyst UV and textures.

Files:

• drizzle/DrizzlePrp/src/automation/realmyst.java (modified) (5 diffs)
• drizzle/DrizzlePrp/src/export3ds/FaceArray.java (modified) (4 diffs)
• drizzle/DrizzlePrp/src/export3ds/Material.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/export3ds/Meshdata.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/export3ds/TextureMap.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/export3ds/Typeid.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/export3ds/UOffset.java (added)
• drizzle/DrizzlePrp/src/export3ds/UScale.java (added)
• drizzle/DrizzlePrp/src/export3ds/VOffset.java (added)
• drizzle/DrizzlePrp/src/export3ds/VScale.java (added)
• drizzle/DrizzlePrp/src/filesearcher/search.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/gui/Gui.form (modified) (1 diff)
• drizzle/DrizzlePrp/src/gui/Gui.java (modified) (7 diffs)
• drizzle/DrizzlePrp/src/realmyst/Bstr.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/realmyst/Count2.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/realmyst/Count3Undone.java (modified) (6 diffs)
• drizzle/DrizzlePrp/src/realmyst/Idx.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/realmyst/Matrix.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/realmyst/Mdb.java (modified) (9 diffs)
• drizzle/DrizzlePrp/src/realmyst/Sdb.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/shared/Flt.java (modified) (2 diffs)

drizzle/DrizzlePrp/src/automation/realmyst.java

@@ -11 +11 @@
-import java.util.Vector;
-import java.io.File;
+import java.util.HashMap;
-
-public class realmyst
-{
+    public static void testrun2(Vector<Sdb> sdbs, Vector<Mdb> mdbs)
+    {
+        Primary main = Primary.createNull();
+        HashMap<Integer, Count3Undone> materialmap = new HashMap();
+        for(Sdb sdb: sdbs)
+        {
+            if(!sdb.sourceName.endsWith("70919002.vdb")) continue;
+            
+            for(int matindex=0;matindex<sdb.count3s.length;matindex++)
+            {
+                Count3Undone c3 = sdb.count3s[matindex];
+                
+                if(c3.possibilities.length!=1) continue;
+                int textureIndex = c3.possibilities[0];
+                if(textureIndex==-1) continue;
+
+                //create material.
+                String textureFilename = sdb.count2s[textureIndex].textureFilename.toString();
+                String matname = c3.sb2.str.toString();
+                //String matname = "mat"+Integer.toString(matindex);
+                Material mat = Material.create(matname);
+                mat.texturemap = TextureMap.create(textureFilename+".dds");
+                //apply uv transform while we're here.
+                Matrix matrix = null;
+                if(c3.subs!=null && c3.subs.length>0) matrix = c3.subs[0].m400;
+                if(matrix!=null)
+                {
+                    Flt uscale = matrix.values[0][0];
+                    Flt vscale = matrix.values[1][1];
+                    Flt uoffset = matrix.values[0][3];
+                    Flt voffset = matrix.values[1][3];
+                    voffset.multModify(-1.0f);
+                    mat.texturemap.uoffset = UOffset.create(uoffset.toJavaFloat());
+                    mat.texturemap.voffset = VOffset.create(voffset.toJavaFloat());
+                    mat.texturemap.uscale = UScale.create(uscale.toJavaFloat());
+                    mat.texturemap.vscale = VScale.create(vscale.toJavaFloat());
+                }
+
+                main.meshdata.mats.add(mat);
+                    
+                materialmap.put(matindex, c3);
+            }
+            
+        }
+        
+        for(Mdb mdb: mdbs)
+        {
+            if(!mdb.name.toString().equals("myst..portstairstep")) continue;
+            
+            NamedObj namedobj = createnamedobj(mdb,materialmap);
+            main.meshdata.objs.add(namedobj);
+        }
+        
+        //save 3ds file.
+        IBytedeque out = new Bytedeque2();
+        main.compile(out);
+        byte[] filedata = out.getAllBytes();
+        FileUtils.WriteFile("c:/hsmout/000test.3ds", filedata);
+    }
+    public static NamedObj createnamedobj(Mdb mdb, HashMap<Integer, Count3Undone> materialmap)
+    {
+        String ignorereason = "";
+        if(mdb.fs==null) ignorereason += "Skipping NamedObj because it has no fs. ";
+        if(mdb.bunch==null) ignorereason += "Skipping NamedObj because it has no bunch. ";
+        if(mdb.whas==null) ignorereason += "Skipping NamedObj because it has no whas. ";
+        if(mdb.trips==null) ignorereason += "NamedObj has no trips.";
+        if(!ignorereason.equals("")) throw new ignore(ignorereason);
+        
+        Vertex[] verts = new Vertex[mdb.fs.length];
+        for(int i=0;i<mdb.fs.length;i++)
+        {
+            int to = mdb.fs[i].v2;
+            int from = mdb.fs[i].v3;
+            Flt x= mdb.bunch[to].f1;
+            Flt y= mdb.bunch[to].f2;
+            Flt z= mdb.bunch[to].f3;
+            verts[i] = Vertex.createFromFlts(x, y, z);
+        }
+
+        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;
+            Flt w = mdb.trips[i].z;
+            Flt u2 = Flt.createFromJavaFloat(1.0f - u.toJavaFloat()); //v = 1 - v;
+            Flt v2 = Flt.createFromJavaFloat(1.0f - v.toJavaFloat()); //v = 1 - v;
+            Flt w2 = Flt.createFromJavaFloat(1.0f - w.toJavaFloat()); //v = 1 - v;
+            uvcoords[i] = FltPair.createFromFlts(u, v2);
+        }
+
+        ShortTriplet[] faces = new ShortTriplet[mdb.whas.length];
+        for(int i=0;i<mdb.whas.length;i++)
+        {
+            int v1 = mdb.whas[i].u6;
+            int v2 = mdb.whas[i].u7;
+            int v3 = mdb.whas[i].u8;
+            faces[i] = ShortTriplet.createFromShorts((short)v1, (short)v2, (short)v3);
+            Flt uscale = mdb.whas[i].f12;
+            //uvcoords[v1].u.multModify(uscale);
+            //uvcoords[v2].u.multModify(uscale);
+            //uvcoords[v3].u.multModify(uscale);
+        }
+
+        String objname = mdb.name.toString();
+        
+        NamedObj newobj = NamedObj.createNull(objname);
+        newobj.namedTriangleObject = NamedTriangleObject.createNull();
+        newobj.namedTriangleObject.points = PointArray.create(verts);
+        //newobj.namedTriangleObject.faces = FaceArray.create(faces, "defaultmat");
+        newobj.namedTriangleObject.faces = FaceArray.createNull();
+        newobj.namedTriangleObject.faces.facecount = check.intToShort(faces.length);
+        newobj.namedTriangleObject.faces.faces = new FaceArray.tdsface[faces.length];
+        for(int i=0;i<faces.length;i++)
+        {
+            short v1 = faces[i].p;
+            short v2 = faces[i].q;
+            short v3 = faces[i].r;
+            short flags = 0;
+            newobj.namedTriangleObject.faces.faces[i] = new FaceArray.tdsface(v1,v2,v3,flags);
+        }
+        for(int curmat=0;curmat<mdb.ii.count;curmat++)
+        {
+            int curmatindex = mdb.ii.indices[curmat];
+            Count3Undone c3= materialmap.get(curmatindex);
+            String curmatname = c3.sb2.str.toString();
+            int curmatvertcount = 0;
+            for(int i=0;i<mdb.ifi.values.length;i++)
+            {
+                if(mdb.ifi.values[i]==curmatindex) curmatvertcount++;
+            }
+            short[] facesToApplyTo = new short[curmatvertcount];
+            int curface = 0;
+            for(int i=0;i<mdb.ifi.values.length;i++)
+            {
+                if(mdb.ifi.values[i]==curmatindex)
+                {
+                    facesToApplyTo[curface] = (short)i;
+                    curface++;
+                    
+                    //apply uv transform while we're here.
+                    //Matrix matrix = c3.subs[0].m400;
+                    //Flt uscale = matrix.values[0][0];
+                    //Flt vscale = matrix.values[1][1];
+                    //Flt uoffset = matrix.values[0][3];
+                    //Flt voffset = matrix.values[1][3];
+                    //int v1 = mdb.whas[i].u6;
+                    //int v2 = mdb.whas[i].u7;
+                    //int v3 = mdb.whas[i].u8;
+                    //uvcoords[v1].u.multModify(uscale);
+                    //uvcoords[v1].u.addModify(uoffset);
+                    //uvcoords[v2].u.multModify(uscale);
+                    //uvcoords[v2].u.addModify(uoffset);
+                    //uvcoords[v3].u.multModify(uscale);
+                    //uvcoords[v3].u.addModify(uoffset);
+                }
+            }
+            MeshMatGroup mmg = MeshMatGroup.create(curmatname, facesToApplyTo);
+            newobj.namedTriangleObject.faces.mats.add(mmg);
+        }
+        
+        
+        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);
+                
+            }
+        }
+
+        return newobj;
+    }
+    public static void testrun(Vector<Sdb> sdbs, Vector<Mdb> mdbs)
+    {
+        Primary main = Primary.createNull();
+        //main.meshdata.mat = Material.create("defaultmat");
+        //add texture filename...
+        //main.meshdata.mat.texturemap = TextureMap.create("active.hsm.dds");
+
+        String[] mystrooms = automation.realmyst.findRoomInfo(sdbs,"Myst");
+        //Vector<realmyst.Mdb> mystmdbs = automation.realmyst.filterMdbsByRoom(mdbs, mystrooms);
+        //automation.realmyst.save3dsFile(mystmdbs);
+        int matnum = 0;
+        for(Sdb sdb: sdbs)
+        {
+            if(sdb.sourceName.endsWith("70919002.vdb"))
+            {
+                int i=0;
+                for(Count2 c2: sdb.count2s)
+                {
+                    String texsrch = "stonestep.hsm";//"GBdock.hsm";
+                    if(c2.textureFilename.toString().equals(texsrch))
+                    {
+                        int dummy=0;
+                    }
+                    i++;
+                }
+                int j=0;
+                for(Count3Undone c3: sdb.count3s)
+                {
+                    int textureIndex = c3.possibility;
+                    if(textureIndex!=-1)
+                    {
+                        String textureFilename = sdb.count2s[textureIndex].textureFilename.toString();
+                        String name = c3.sb2.str.toString();
+                        if(textureIndex==185)
+                        {
+                            int dummy=0;
+                        }
+                        if(name.startsWith("myst..portstairstep"))//"myst..portfloor"))
+                        {
+                            int dummy=0;
+                        }
+                        for(Mdb mdb: mdbs)
+                        {
+                            String mdbname = mdb.name.toString();
+                            if(name.equals(mdbname))
+                            {
+                                matnum++;
+                                String matname = "mat"+Integer.toString(matnum);
+                                Material mat = Material.create(matname);
+                                mat.texturemap = TextureMap.create(textureFilename+".dds");
+                                main.meshdata.mats.add(mat);
+                                
+                                try
+                                {
+                                    NamedObj obj = createNamedObj(mdb);//, main, sdb);
+                                    obj.namedTriangleObject.faces.mats.get(0).name = Ntstring.createFromString(matname);
+                                    main.meshdata.objs.add(obj);
+                                }
+                                catch(ignore e)
+                                {
+                                    int dummy=0;
+                                }
+                                int dummy=0;
+                            }
+                        }
+                    }
+                    j++;
+                }
+            }
+        }
+        
+        IBytedeque out = new Bytedeque2();
+        main.compile(out);
+        byte[] filedata = out.getAllBytes();
+        FileUtils.WriteFile("c:/hsmout/000test.3ds", filedata);
+        
+    }
-    public static Vector<Mdb> filterMdbsByRoom(Vector<Mdb> mdbs, String[] rooms)
-    {
@@ -44 +306 @@
-        return result;
-    }
-l
+d
-    {
-        File f = new File(folder+"/scn/maps");
@@ -248 +510 @@
-    {
-        Primary main = Primary.createNull();
-main.meshdata.
+Material 
-        
-        //add texture filename...
-
+
+
+
-        
-        for(Mdb mdb: mdbs)
@@ -272 +536 @@
-    }
-    
-
+//, Primary main, Sdb sdb)
-    {
-        /*Vertex[] verts = new Vertex[bunch.length];
@@ -317 +581 @@
-            Flt u = mdb.trips[i].x;
-            Flt v = mdb.trips[i].y;
-
+
+
+
+
+
-        }
-

drizzle/DrizzlePrp/src/export3ds/FaceArray.java

@@ -7 +7 @@
-
-import shared.*;
+import java.util.Vector;
-
-public class FaceArray extends tdsobj
@@ -12 +13 @@
-    public short facecount;
-    public tdsface[] faces;
-
+
+
-    
-    private FaceArray(){}
-    
+    public static FaceArray createNull()
+    {
+        FaceArray result = new FaceArray();
+        return result;
+    }
-    public static FaceArray create(ShortTriplet[] faces, String matname)
-    {
@@ -34 +41 @@
-            facesToApplyTo[i] = (short)i;
-        }
- = MeshMatGroup.create(matname, facesToApplyTo
+s.add(MeshMatGroup.create(matname, facesToApplyTo)
-        return result;
-    }
@@ -42 +49 @@
-        c.writeShort(facecount);
-        c.writeArray(faces);
-
+
+
-    }
-    

drizzle/DrizzlePrp/src/export3ds/Material.java

@@ -16 +16 @@
-    
-    public TextureMap texturemap;
+    
-    
-    private Material(){}

drizzle/DrizzlePrp/src/export3ds/Meshdata.java

@@ -11 +11 @@
-public class Meshdata extends tdsobj
-{
-
+
+
-    //public NamedObj obj;
-<NamedObj>
+
-    
-    private Meshdata(){}
@@ -25 +26 @@
-    public void innercompile(IBytedeque c)
-    {
-
+
+
-        //obj.compile(c);
-        c.writeVector(objs);

drizzle/DrizzlePrp/src/export3ds/TextureMap.java

@@ -13 +13 @@
-    public TextureFilename texturefilename;
-    
+    public UOffset uoffset;
+    public VOffset voffset;
+    public UScale uscale;
+    public VScale vscale;
+
-    private TextureMap(){}
-    
@@ -27 +32 @@
-    {
-        texturefilename.compile(c);
+
+        if(uoffset!=null) uoffset.compile(c);
+        if(voffset!=null) voffset.compile(c);
+        if(uscale!=null) uscale.compile(c);
+        if(vscale!=null) vscale.compile(c);
-    }
-    

drizzle/DrizzlePrp/src/export3ds/Typeid.java

@@ -29 +29 @@
-    texturefilename,
-    uvcoords,
+    uoffset,
+    voffset,
+    uscale,
+    vscale,
-    ;
-    public static pair[] pairs = {
@@ -49 +53 @@
-        p((short)0xa200, texturemap),
-        p((short)0xa300, texturefilename),
+        p((short)0xa358, uoffset),
+        p((short)0xa35a, voffset),
+        p((short)0xa356, uscale),
+        p((short)0xa354, vscale),
-    };
-    

drizzle/DrizzlePrp/src/filesearcher/search.java

@@ -25 +25 @@
-    public static boolean searchForString(File f, String searchstr)
-    {
+        return (searchForStringPos(f,searchstr)!=-1);
+    }
+    public static int searchForStringPos(File f, String searchstr)
+    {
-        byte[] data = FileUtils.ReadFile(f);
-        String filedata = b.BytesToString(data);
-        int index = filedata.indexOf(searchstr);
-
+
+
-    }
-    public static Vector<File> getallfiles(String folder, boolean recurse)

drizzle/DrizzlePrp/src/gui/Gui.form

@@ -2971 +2971 @@
-              </Constraints>
-            </Component>
+            <Component class="shared.State.TextfieldState" name="textfieldState29">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="textfieldState29"/>
+                <Property name="name" type="java.lang.String" value="searchString" noResource="true"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="650" y="40" width="130" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="shared.State.TextfieldState" name="textfieldState30">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="textfieldState30"/>
+                <Property name="name" type="java.lang.String" value="searchPath" noResource="true"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="650" y="10" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
-          </SubComponents>
-        </Container>

drizzle/DrizzlePrp/src/gui/Gui.java

@@ -585 +585 @@
-        jButton109 = new javax.swing.JButton();
-        jButton110 = new javax.swing.JButton();
+        textfieldState29 = new shared.State.TextfieldState();
+        textfieldState30 = new shared.State.TextfieldState();
-        jPanel12 = new javax.swing.JPanel();
-        jButton50 = new javax.swing.JButton();
@@ -2505 +2507 @@
-                jButton110.setBounds(380, 160, 63, 36);
-
+                textfieldState29.setText("textfieldState29");
+                textfieldState29.setName("searchString"); // NOI18N
+                jPanel10.add(textfieldState29);
+                textfieldState29.setBounds(650, 40, 130, 20);
+
+                textfieldState30.setText("textfieldState30");
+                textfieldState30.setName("searchPath"); // NOI18N
+                jPanel10.add(textfieldState30);
+                textfieldState30.setBounds(650, 10, 87, 20);
+
-                tabsState3.addTab("realMyst", jPanel10);
-
@@ -4108 +4120 @@
-    //m.state.curstate.writeToFile = true;
-    
-l
+d
-    //automation.realmyst.save3dsFile(mdbs);
-    automation.realmyst.saveDdsFiles(hsms,"c:/hsmout");
@@ -4115 +4127 @@
-
-private void jButton109ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton109ActionPerformed
-
+
+
+
+
-    String[] searchstrs = {
-        //6910138.vdb
@@ -4160 +4175 @@
-        "myst..base_mountain"
-    };
+    searchstrs = searchstr.split(sep);
+    //String[] searchstrs2 = new String[]{this.textfieldState29.getText()};
-    Vector<File> files = filesearcher.search.getallfiles(folder, false);
-    for(File f: files)
-    {
-
-
+
+
+
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -4178 +4208 @@
-    
-    Vector<realmyst.Sdb> sdbs = automation.realmyst.readAllSdbs(outfol);
-    String[] mystrooms = automation.realmyst.findRoomInfo(sdbs,"Myst");
-    
-    Vector<realmyst.Mdb> mdbs = automation.realmyst.readAllMdbs(outfol);
-
-
-
-
+
+
+
+
+
-    
-}//GEN-LAST:event_jButton110ActionPerformed
@@ -4478 +4508 @@
-    private shared.State.TextfieldState textfieldState27;
-    private shared.State.TextfieldState textfieldState28;
+    private shared.State.TextfieldState textfieldState29;
-    private shared.State.TextfieldState textfieldState3;
+    private shared.State.TextfieldState textfieldState30;
-    private shared.State.TextfieldState textfieldState4;
-    private shared.State.TextfieldState textfieldState5;

drizzle/DrizzlePrp/src/realmyst/Bstr.java

@@ -33 +33 @@
-    byte[] string;
-    
+    public Bstr(IBytestream c, boolean lastByteShouldBeNulled)
+    {
+        strlen = c.readInt();
+        string = new byte[strlen];
+        for(int i=0;i<strlen;i++)
+        {
+            string[i] = c.readByte();
+        }
+        
+        if(lastByteShouldBeNulled)
+        {
+            string[strlen-1] = 0;
+        }
+    }
-    public Bstr(IBytestream c)
-    {

drizzle/DrizzlePrp/src/realmyst/Count2.java

@@ -31 +31 @@
-    public Bstr s4;
-    public byte b5;
-s6
+textureFilename
-    public int u7;
-    
+    //texture
-    public Count2(IBytestream c) //has hsm filename.
-    {
@@ -47 +48 @@
-        s4 = new Bstr(c);
-        b5 = c.readByte(); e.ensure((int)b5,0);
-s6
+textureFilename
-        u7 = c.readInt(); //e.ensure(u7,0x800000,0x18800000,0x10800000,0x10900000,0x20800000,0x900000);
-        int dummy=0;

drizzle/DrizzlePrp/src/realmyst/Count3Undone.java

@@ -27 +27 @@
-    int size;
-    
-
+
+
-    
+    public StringAndByte sb2;
+    public StringAndByte[] sb3a;
+    public int u7;
+    public int u5;
+    public subcount3[] subs;
-    public static int numhandled=0;
-    public static int numignored=0;
-    
+    //material, I think.
-    //sub_409d40, I think, because it reads a sub_40cb70 (4x4 matrix).
-    public Count3Undone(IBytestream c)
@@ -60 +67 @@
-        int u1 = c.readInt();  e.ensure(u1,1);
-        
-StringAndByte 
+
-        //int bytecount = c.readInt();
-        //if(bytecount>256) return;
@@ -76 +83 @@
-        //    int dummy=0;
-        //}
-StringAndByte[] 
+
-        int u4 = c.readInt(); e.ensure(u4,3);
-int 
+
-        int u6 = c.readInt(); e.ensure(u6,655,645,557,649,521,533,544,512,644,556,535,513,520,549,133,524,23,6,525,516,517,29,7,15,5,37,21,13,12,45,9,4,36,1,0,33,8,141);//e.ensure(u6,5,8,4,13,37,12,36,21,9,1,33); //13
-
+
+
+
+
+
+
+
+
-        try{
-            numignored++;
-count3[] sub
+
-            numignored--;
-            numhandled++;
@@ -209 +223 @@
-    public static class subcount3
-    {
-
+public 
-        int ending;
+        public Flt u14;
+        public Flt u15;
+        public Flt f200;
+        public Flt f203;
+        public Flt f16;
+        public Flt f17;
+        public Flt f18;
+        public Flt f19;
+        public Flt f20;
+        public Flt f21;
+        public Flt f22;
+        public Flt f23;
+        public Matrix m400;
-        
-        public static int numignored = 0;
@@ -241 +268 @@
-            //m.msg("count3: u8b="+Integer.toString(u8b)+" u9="+Integer.toString(u9));
-            //if(true)return;
-Flt 
-Flt 
+
+
-            if((u12&0x20)!=0)
-            {
-Flt 
+
-                int dummy=0;
-            }
@@ -258 +285 @@
-            if((esiPlus120&0x4000)!=0)
-            {
-Flt 
-
-
-Flt u
-Flt u
-Flt u
-Flt 
-Flt 
-Flt 
-Flt 
-Flt 
-
-
+
+
+
+f
+f
+f
+
+
+
+
+
+
+//
-            if((esiPlus120&0x10)!=0)
-            {

drizzle/DrizzlePrp/src/realmyst/Idx.java

@@ -46 +46 @@
-        RoomIndex = new IdxBlock(c);
-        NamedGroupIndex = new IdxBlock(c);
+        int saveGroupCount = 0;
+        for(IdxEntry entry: SaveGroupIndex.entries)
+        {
+            saveGroupCount += entry.indexcount;
+        }
+        int roomCount = 0;
+        for(IdxEntry entry: RoomIndex.entries)
+        {
+            roomCount += entry.indexcount;
+        }
+        int dummy=0;
-        //idxblocks = c.readArray(IdxBlock.class, blockcount);
-        //c.toString();
@@ -95 +106 @@
-            indexes = c.readInts(indexcount);
-        }
+        
+        public String toString()
+        {
+            return name.toString();
+        }
-    }
-}

drizzle/DrizzlePrp/src/realmyst/Matrix.java

@@ -23 +23 @@
-public class Matrix
-{
-
+public 
-    
-    public Matrix(IBytestream c)

drizzle/DrizzlePrp/src/realmyst/Mdb.java

@@ -31 +31 @@
-    public Sixlet start;
-    public Sixlet[] bunch;
+    public Quat[] quats;
-    public Face[] fs;    
-
-
+public 
+public 
-    public wha[] whas;
-    public Vertex[] trips;
+    public Face[] fs2;
+    public int[] extra;
-    
-    
-    static Primary main;
+    public String sourceName;
-    public Mdb(IBytestream c)
-    {
@@ -46 +50 @@
-    {
-        int curfilenum = realmyst.rmcontext.get().curnum;
+        sourceName = c.sourceName;
-        
-        //tag = c.readInt();
@@ -56 +61 @@
-        filesize = c.readInt(); //filesize (including header)
-        u2 = c.readInt(); e.ensure(u2,1);//=1?
-
+,true
-        String trap = 
-                //"aurora..sn_TOWER_observe_roof01"
-                //"aurora..switchtube"
-
+
+
+
-                ;
-        if(name.toString().toLowerCase().startsWith(trap.toLowerCase()))
@@ -113 +120 @@
-            int s2 = c.readInt(); //4
-            bunch = c.readArray(Sixlet.class, s2); //vertex and vertex normal (vertex normal is average of face normals of adjacent faces.)
-Quat[] 
+
-            if(s1!=2)
-            {
@@ -196 +203 @@
-        
-        
-
+//
-        //if(u7!=267)
-        if(u7==1||u7==11||u7==9)
@@ -218 +225 @@
-        //int u33 = c.readInt(); //5  5  5
-        
+        
+        //maps faces to material indexes, use IntsFullIndex.
-        //IntsIndex:
-        int u26 = c.readInt();
-        //int[] extra = c.readInts(u26-1); //n-1 extra ints.
-        //int u32 = c.readInt();
-int[] 
+
-
-        //if(u7!=267)
@@ -246 +255 @@
-    public static class IntsFullIndex
-    {
-
+