improve PPtr functions

2 files changed, 7 insertions, 3 deletions

diff --git a/src/bin/meshes.rs b/src/bin/meshes.rs
index d59b496..e3758c4 100644
--- a/src/bin/meshes.rs
+++ b/src/bin/meshes.rs
@@ -16,7 +16,6 @@ fn main() -> anyhow::Result<()> {
     env_logger::init_from_env("LOG");
     let file = || BufReader::new(File::open(args().nth(1).unwrap()).unwrap());
     let mut fs = UnityFS::open(file())?;
-    // let mut fs2 = UnityFS::open(file())?;
 
     let mut i = 0;
     create_dir_all("/tmp/a").unwrap();
diff --git a/src/bin/typegraph.rs b/src/bin/typegraph.rs
index 7425778..ea55e05 100644
--- a/src/bin/typegraph.rs
+++ b/src/bin/typegraph.rs
@@ -41,7 +41,10 @@ fn main() -> anyhow::Result<()> {
                         if let Some(inner) = c.type_string.strip_prefix("PPtr<") {
                             c.type_string = inner.strip_suffix(">").unwrap().to_owned();
                             f = true;
-                        } else if matches!(c.type_string.as_str(), "Array" | "pair" | "map") {
+                        } else if matches!(
+                            c.type_string.as_str(),
+                            "Array" | "pair" | "map" | "vector"
+                        ) {
                             nc.extend(c.children);
                             f = true
                         } else {
@@ -105,7 +108,6 @@ fn is_primitive(s: &str) -> bool {
             | "SInt64"
             | "bool"
             | "float"
-            | "vector"
             | "string"
             | "float3"
             | "float4"
@@ -113,6 +115,9 @@ fn is_primitive(s: &str) -> bool {
             | "Vector2f"
             | "Vector3f"
             | "Vector4f"
+            | "Matrix4x4f"
+            | "ColorRGBA"
+            | "Rectf"
             | "Quaternionf"
             | "xform"
     )