Merge pull request #9 from arceusVen1/feat-header-2-parsing

fix minor reading details and naming + early header 2 parsing
arceusVen1 · Feb 24, 2024 · 703e811 · 703e811
2 parents 1931e89 + c8d23a7
commit 703e811
Show file tree

Hide file tree

Showing 24 changed files with 1,248 additions and 169 deletions.
diff --git a/docs/gsf/gsf_full.jpeg b/docs/gsf/gsf_full.jpeg
diff --git a/docs/gsf/kaitai/gsf.ksy b/docs/gsf/kaitai/gsf.ksy
diff --git a/lib/classes/gsf/gsf.dart b/lib/classes/gsf/gsf.dart
@@ -1,15 +1,20 @@
 import 'dart:typed_data';
 
-import 'package:paraworld_gsf_viewer/classes/gsf/header.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/header.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header2/header2.dart';
 
 class GSF {
-  const GSF({
+  GSF({
     required this.header,
+    required this.header2,
   });
 
   final Header header;
+  late final Header2 header2;
 
-  GSF.fromBytes(Uint8List bytes) : header = Header.fromBytes(bytes);
+  GSF.fromBytes(Uint8List bytes) : header = Header.fromBytes(bytes) {
+    header2 = Header2.fromBytes(bytes, header.getEndOffset());
+  }
 
   @override
   String toString() {

diff --git a/lib/classes/gsf/header/anim_flags_table.dart b/lib/classes/gsf/header/anim_flags_table.dart
@@ -0,0 +1,32 @@
+import 'dart:typed_data';
+
+import 'package:paraworld_gsf_viewer/classes/gsf_data.dart';
+
+class AnimFlagTable extends GsfPart {
+  late final Standard4BytesData<int> nameLength;
+
+  AnimFlagTable.fromBytes(Uint8List bytes, int offset) : super(offset: offset) {
+    nameLength = Standard4BytesData(
+      position: 0,
+      bytes: bytes,
+      offset: offset,
+    );
+
+    name = GsfData.fromPosition(
+      relativePos: nameLength.relativeEnd,
+      length: nameLength.value,
+      bytes: bytes,
+      offset: offset,
+    );
+  }
+
+  @override
+  int getEndOffset() {
+    return name.offsettedLength;
+  }
+
+  @override
+  String toString() {
+    return 'AnimFlagsTable: $name';
+  }
+}
diff --git a/lib/classes/gsf/dust_trail_info.dart → lib/classes/gsf/header/dust_trail_info.dart b/lib/classes/gsf/dust_trail_info.dart → lib/classes/gsf/header/dust_trail_info.dart
@@ -41,7 +41,7 @@ class DustTrailInfo extends GsfPart {
           bytes,
           entries.isNotEmpty
               ? entries.last.getEndOffset()
-              : entryCount.offsettedLength(offset),
+              : entryCount.offsettedLength,
         ));
       }
     }
@@ -51,7 +51,7 @@ class DustTrailInfo extends GsfPart {
   int getEndOffset() {
     return entries.isNotEmpty
         ? entries.last.getEndOffset()
-        : entryCount.offsettedLength(offset);
+        : entryCount.offsettedLength;
   }
 
   @override
@@ -87,6 +87,6 @@ class DustTrailEntry extends GsfPart {
 
   @override
   int getEndOffset() {
-    return valueChars.offsettedLength(offset);
+    return valueChars.offsettedLength;
   }
 }
diff --git a/lib/classes/gsf/dust_trail_table.dart → lib/classes/gsf/header/dust_trail_table.dart b/lib/classes/gsf/dust_trail_table.dart → lib/classes/gsf/header/dust_trail_table.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:paraworld_gsf_viewer/classes/gsf/dust_trail_info.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/dust_trail_info.dart';
 import 'package:paraworld_gsf_viewer/classes/gsf_data.dart';
 
 class DustTrailTable extends GsfPart {
@@ -23,7 +23,7 @@ class DustTrailTable extends GsfPart {
           bytes,
           dustTrailInfos.isNotEmpty
               ? dustTrailInfos.last.getEndOffset()
-              : dustTrailCount.offsettedLength(offset),
+              : dustTrailCount.offsettedLength,
         ),
       );
     }
@@ -33,7 +33,7 @@ class DustTrailTable extends GsfPart {
   int getEndOffset() {
     return dustTrailInfos.isNotEmpty
         ? dustTrailInfos.last.getEndOffset()
-        : dustTrailCount.offsettedLength(offset);
+        : dustTrailCount.offsettedLength;
   }
 
   @override

diff --git a/lib/classes/gsf/header.dart → lib/classes/gsf/header/header.dart b/lib/classes/gsf/header.dart → lib/classes/gsf/header/header.dart
@@ -1,35 +1,33 @@
 import 'dart:typed_data';
 
-import 'package:paraworld_gsf_viewer/classes/gsf/dust_trail_table.dart';
-import 'package:paraworld_gsf_viewer/classes/gsf/model_info.dart';
-import 'package:paraworld_gsf_viewer/classes/gsf/sound_table.dart';
-import 'package:paraworld_gsf_viewer/classes/gsf/walk_transition_table.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/anim_flags_table.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/dust_trail_table.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/model_info.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/sound_table.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/walk_transition_table.dart';
 import 'package:paraworld_gsf_viewer/classes/gsf_data.dart';
 
 class Header extends GsfPart {
   Header({
-    required this.name,
     required this.modelCount,
     required this.soundTable,
     required this.modelInfos,
     required this.dustTrailTable,
-    required this.walkTransitionTable1,
-    required this.walkTransitionTable2,
   }) : super(offset: 0);
 
   late final GsfData<int> _magic;
   late final Standard4BytesData<int> _version;
 
   late final Standard4BytesData<int> contentTableOffset;
   late final Standard4BytesData<int> nameLength;
-  late final GsfData<String> name;
   late final Standard4BytesData<int> modelCount;
   late final List<ModelInfo> modelInfos;
   late final SoundTable soundTable;
   late final DustTrailTable dustTrailTable;
-  late final WalkTransitionTable walkTransitionTable1;
-  late final WalkTransitionTable
-      walkTransitionTable2; // there seems to be 2 transitions tables
+  late final Standard4BytesData<int> animFlagsCount;
+  late final List<AnimFlagTable> animFlagsTables = [];
+  late final Standard4BytesData<int> walkTransitionsCount;
+  late final List<WalkTransitionTable> walkTransitionTables = [];
 
   Header.fromBytes(Uint8List bytes) : super(offset: 0) {
     _magic = GsfData.fromPosition(
@@ -51,7 +49,10 @@ class Header extends GsfPart {
     );
 
     modelCount = Standard4BytesData<int>(
-        position: name.relativeEnd, bytes: bytes, offset: offset);
+      position: name.relativeEnd,
+      bytes: bytes,
+      offset: offset,
+    );
     print("modelCount: $modelCount");
     modelInfos = [];
     for (var i = 0; i < modelCount.value; i++) {
@@ -60,31 +61,57 @@ class Header extends GsfPart {
           bytes,
           modelInfos.isNotEmpty
               ? modelInfos.last.getEndOffset()
-              : modelCount.offsettedLength(offset),
+              : modelCount.offsettedLength,
         ),
       );
     }
     soundTable = SoundTable.fromBytes(
       bytes,
       modelInfos.isNotEmpty
           ? modelInfos.last.getEndOffset()
-          : modelCount.offsettedLength(offset),
+          : modelCount.offsettedLength,
     );
 
     dustTrailTable = DustTrailTable.fromBytes(
       bytes,
       soundTable.getEndOffset(),
     );
 
-    walkTransitionTable1 = WalkTransitionTable.fromBytes(
-      bytes,
-      dustTrailTable.getEndOffset(),
+    animFlagsCount = Standard4BytesData(
+      position: dustTrailTable.getEndOffset() - offset,
+      bytes: bytes,
+      offset: offset,
     );
 
-    walkTransitionTable2 = WalkTransitionTable.fromBytes(
-      bytes,
-      walkTransitionTable1.getEndOffset(),
+    for (var i = 0; i < animFlagsCount.value; i++) {
+      animFlagsTables.add(
+        AnimFlagTable.fromBytes(
+          bytes,
+          animFlagsTables.isNotEmpty
+              ? animFlagsTables.last.getEndOffset()
+              : animFlagsCount.offsettedLength,
+        ),
+      );
+    }
+
+    walkTransitionsCount = Standard4BytesData(
+      position: animFlagsTables.isNotEmpty
+          ? animFlagsTables.last.getEndOffset() - offset
+          : animFlagsCount.offsettedLength,
+      bytes: bytes,
+      offset: offset,
     );
+
+    for (var i = 0; i < walkTransitionsCount.value; i++) {
+      walkTransitionTables.add(
+        WalkTransitionTable.fromBytes(
+          bytes,
+          walkTransitionTables.isNotEmpty
+              ? walkTransitionTables.last.getEndOffset()
+              : walkTransitionsCount.offsettedLength,
+        ),
+      );
+    }
   }
 
   @override
@@ -101,6 +128,8 @@ class Header extends GsfPart {
 
   @override
   int getEndOffset() {
-    return walkTransitionTable2.getEndOffset();
+    return walkTransitionTables.isNotEmpty
+        ? walkTransitionTables.last.getEndOffset()
+        : walkTransitionsCount.offsettedLength;
   }
 }
diff --git a/lib/classes/gsf/model_anim.dart → lib/classes/gsf/header/model_anim.dart b/lib/classes/gsf/model_anim.dart → lib/classes/gsf/header/model_anim.dart
@@ -1,13 +1,12 @@
 import 'dart:typed_data';
 
-import 'package:paraworld_gsf_viewer/classes/gsf/sound_indices.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/sound_indices.dart';
 import 'package:paraworld_gsf_viewer/classes/gsf_data.dart';
 
 class ModelAnim extends GsfPart {
   ModelAnim({required super.offset});
 
   late final Standard4BytesData<int> nameLength;
-  late final GsfData<String> name;
   late final Standard4BytesData<int> index;
   late final SoundIndices soundIndices;
   late final Standard4BytesData<UnknowData> unknownData;
@@ -25,7 +24,7 @@ class ModelAnim extends GsfPart {
     index = Standard4BytesData(
         position: name.relativeEnd, bytes: bytes, offset: offset);
 
-    soundIndices = SoundIndices.fromBytes(bytes, index.offsettedLength(offset));
+    soundIndices = SoundIndices.fromBytes(bytes, index.offsettedLength);
     unknownData = Standard4BytesData(
       position: index.relativeEnd + soundIndices.length,
       bytes: bytes,
@@ -35,7 +34,7 @@ class ModelAnim extends GsfPart {
 
   @override
   int getEndOffset() {
-    return unknownData.offsettedLength(offset);
+    return unknownData.offsettedLength;
   }
 
   @override

diff --git a/lib/classes/gsf/model_info.dart → lib/classes/gsf/header/model_info.dart b/lib/classes/gsf/model_info.dart → lib/classes/gsf/header/model_info.dart
@@ -1,21 +1,19 @@
 import 'dart:typed_data';
 
-import 'package:paraworld_gsf_viewer/classes/gsf/model_anim.dart';
-import 'package:paraworld_gsf_viewer/classes/gsf/walk_set_table.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/model_anim.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/walk_set_table.dart';
 import 'package:paraworld_gsf_viewer/classes/gsf_data.dart';
 
 class ModelInfo extends GsfPart {
   ModelInfo({
     required offset,
-    required this.name,
     required this.index,
     required this.animCount,
     required this.modelAnims,
     required this.walkSetTable,
   }) : super(offset: offset);
 
   late final Standard4BytesData<int> nameLength;
-  late final GsfData<String> name;
   late final Standard4BytesData<int> index;
   late final Standard4BytesData<int> animCount;
   late final List<ModelAnim>
@@ -46,7 +44,7 @@ class ModelInfo extends GsfPart {
           bytes,
           modelAnims.isNotEmpty
               ? modelAnims.last.getEndOffset()
-              : animCount.offsettedLength(offset),
+              : animCount.offsettedLength,
         ));
       }
     }
@@ -55,7 +53,7 @@ class ModelInfo extends GsfPart {
       bytes,
       modelAnims.isNotEmpty
           ? modelAnims.last.getEndOffset()
-          : animCount.offsettedLength(offset),
+          : animCount.offsettedLength,
     );
   }
 

diff --git a/lib/classes/gsf/sound_indices.dart → lib/classes/gsf/header/sound_indices.dart b/lib/classes/gsf/sound_indices.dart → lib/classes/gsf/header/sound_indices.dart
@@ -23,6 +23,6 @@ class SoundIndices extends GsfPart {
 
   @override
   int getEndOffset() {
-    return count.offsettedLength(offset) + indices.length * 4;
+    return indices.isNotEmpty ? indices.last.offsettedLength : count.offsettedLength ;
   }
 }
diff --git a/lib/classes/gsf/sound_info.dart → lib/classes/gsf/header/sound_info.dart b/lib/classes/gsf/sound_info.dart → lib/classes/gsf/header/sound_info.dart
@@ -4,10 +4,9 @@ import 'package:paraworld_gsf_viewer/classes/gsf_data.dart';
 
 class SoundInfo extends GsfPart {
   late final Standard4BytesData<int> nameLength;
-  late final GsfData<String> name;
   late final Standard4BytesData<int> startFrame;
   late final Standard4BytesData<int> volume;
-  late final Standard4BytesData<int> speed;
+  late final Standard4BytesData<double> speed;
   late final GsfData<UnknowData> unknownData; // 16 unknown bytes
   late final Standard4BytesData<int> soundGroupNameLength;
   late final GsfData<String> soundGroupName;
@@ -48,7 +47,7 @@ class SoundInfo extends GsfPart {
 
   @override
   int getEndOffset() {
-    return soundGroupName.offsettedLength(offset);
+    return soundGroupName.offsettedLength;
   }
 
   @override

diff --git a/lib/classes/gsf/sound_table.dart → lib/classes/gsf/header/sound_table.dart b/lib/classes/gsf/sound_table.dart → lib/classes/gsf/header/sound_table.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:paraworld_gsf_viewer/classes/gsf/sound_info.dart';
+import 'package:paraworld_gsf_viewer/classes/gsf/header/sound_info.dart';
 import 'package:paraworld_gsf_viewer/classes/gsf_data.dart';
 
 class SoundTable extends GsfPart {
@@ -21,7 +21,7 @@ class SoundTable extends GsfPart {
           bytes,
           soundInfos.isNotEmpty
               ? soundInfos.last.getEndOffset()
-              : soundCount.offsettedLength(offset),
+              : soundCount.offsettedLength,
         ),
       );
     }
@@ -31,7 +31,7 @@ class SoundTable extends GsfPart {
   int getEndOffset() {
     return soundInfos.isNotEmpty
         ? soundInfos.last.getEndOffset()
-        : soundCount.offsettedLength(offset);
+        : soundCount.offsettedLength;
   }
 
   @override

diff --git a/lib/classes/gsf/walk_set.dart → lib/classes/gsf/header/walk_set.dart b/lib/classes/gsf/walk_set.dart → lib/classes/gsf/header/walk_set.dart
@@ -277,6 +277,6 @@ class WalkSet extends GsfPart {
 
   @override
   int getEndOffset() {
-    return name.offsettedLength(offset);
+    return name.offsettedLength;
   }
 }