1 files changed, 7 insertions, 10 deletions
diff --git a/src/classes/mod.rs b/src/classes/mod.rs
index 038e701..52ed401 100644
--- a/src/classes/mod.rs
+++ b/src/classes/mod.rs
@@ -1,5 +1,6 @@
 pub mod assetinfo;
 pub mod gameobject;
+pub mod material;
 pub mod mesh;
 pub mod pptr;
 pub mod streaminginfo;
@@ -11,7 +12,8 @@ use crate::object::{Value, parser::FromValue};
 use anyhow::Result;
 use assetinfo::AssetInfo;
 use gameobject::GameObject;
-use mesh::{ChannelInfo, Mesh, SubMesh, VertexData};
+use material::Material;
+use mesh::Mesh;
 use pptr::PPtr;
 use serde::Serialize;
 use std::collections::BTreeMap;
@@ -25,12 +27,10 @@ pub enum HValue {
     GameObject(GameObject),
     Transform(Transform),
     PPtr(PPtr),
-    Texture2D(Texture2D),
     StreamingInfo(StreamingInfo),
-    SubMesh(SubMesh),
+    Texture2D(Texture2D),
     Mesh(Mesh),
-    VertexData(VertexData),
-    ChannelInfo(ChannelInfo),
+    Material(Material),
 
     Pair(Box<HValue>, Box<HValue>),
     Value([Value; 1]),
@@ -53,11 +53,8 @@ impl HValue {
                     "GameObject" => Self::GameObject(GameObject::from_value(value)?),
                     "Transform" => Self::Transform(Transform::from_value(value)?),
                     "Texture2D" => Self::Texture2D(Texture2D::from_value(value)?),
-                    // "StreamingInfo" => Self::StreamingInfo(StreamingInfo::from_value(value)?),
-                    // "SubMesh" => Self::SubMesh(SubMesh::from_value(value)?),
-                    // "Mesh" => Self::Mesh(Mesh::from_value(value)?),
-                    // "VertexData" => Self::VertexData(VertexData::from_value(value)?),
-                    // "ChannelInfo" => Self::ChannelInfo(ChannelInfo::from_value(value)?),
+                    "Mesh" => Self::Mesh(Mesh::from_value(value)?),
+                    "Material" => Self::Material(Material::from_value(value)?),
                     _ => Self::Value([value]),
                 }
             }