urisinger
diff --git a/‎azalea-graphics/azalea-assets/src/entity.rs‎
Lines changed: 0 additions & 37 deletions b/‎azalea-graphics/azalea-assets/src/entity.rs‎
Lines changed: 0 additions & 37 deletions
diff --git a/‎azalea-graphics/azalea-assets/src/lib.rs‎
Lines changed: 11 additions & 11 deletions b/‎azalea-graphics/azalea-assets/src/lib.rs‎
Lines changed: 11 additions & 11 deletions
diff --git a/‎azalea-graphics/azalea-assets/src/processed/mod.rs‎
Lines changed: 1 addition & 0 deletions b/‎azalea-graphics/azalea-assets/src/processed/mod.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎azalea-graphics/azalea-assets/src/raw/mod.rs‎
Lines changed: 1 addition & 0 deletions b/‎azalea-graphics/azalea-assets/src/raw/mod.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎azalea-graphics/shaders/src/entity.rs‎
Lines changed: 5 additions & 4 deletions b/‎azalea-graphics/shaders/src/entity.rs‎
Lines changed: 5 additions & 4 deletions
@@ -1,9 +1,8 @@
-pub mod entity;
 pub mod processed;
 mod raw;
-use std::{collections::HashMap, fs, ops::Deref, path::PathBuf, sync::Arc, time::Instant};
+use std::{collections::HashMap, fs, path::PathBuf, sync::Arc, time::Instant};
 
-use azalea_block::{BlockState, BlockTrait};
+use azalea_block::BlockState;
 use log::*;
 use raw::{
     block_state::{BlockRenderState, Variant},
@@ -18,7 +17,7 @@ use self::{
     },
     raw::atlas::SpriteAtlas,
 };
-use crate::processed::atlas::TextureEntry;
+use crate::processed::{atlas::TextureEntry, entity_model::Model};
 
 pub struct Assets {
     path: PathBuf,
@@ -30,7 +29,7 @@ pub struct Assets {
 
     pub block_textures: HashMap<String, TextureEntry>,
 
-    pub entity_models: HashMap<String, entity::ModelPart>,
+    pub entity_models: HashMap<String, Model>,
 }
 
 impl Assets {
@@ -213,7 +212,7 @@ pub fn load_assets(path: impl Into<PathBuf>, max_tex: u32) -> Assets {
                     .filter(|case| {
                         case.when
                             .as_ref()
-                            .map_or(true, |cond| cond.matches(dyn_block.deref()))
+                            .map_or(true, |cond| cond.matches(dyn_block))
                     })
                     .filter_map(|case| match &case.apply {
                         Variant::Single(desc) => Some(desc),
@@ -236,12 +235,17 @@ pub fn load_assets(path: impl Into<PathBuf>, max_tex: u32) -> Assets {
     info!("Mapped blockstates to models in {:?}", start.elapsed());
 
     let entity_models_path = path.join("entity_models.json");
-    let entity_models: HashMap<String, entity::ModelPart> = serde_json::from_str(
+    let raw_entity_models: HashMap<String, raw::entity_model::ModelPart> = serde_json::from_str(
         &fs::read_to_string(&entity_models_path)
             .unwrap_or_else(|_| panic!("missing {}", entity_models_path.display())),
     )
     .expect("invalid entity_models.json");
 
+    let entity_models = raw_entity_models
+        .into_iter()
+        .map(|(name, raw)| (name, Model::from_raw(raw)))
+        .collect();
+
     let start = Instant::now();
 
     let blocks_atlas_path = path.join("atlases/blocks.json");
@@ -317,7 +321,3 @@ fn load_colormap(textures_root: &PathBuf, relative_path: &str) -> Option<image::
         }
     }
 }
-
-fn strip_namespace(model_name: &str) -> &str {
-    model_name.strip_prefix("minecraft:").unwrap_or(model_name)
-}
@@ -5,6 +5,7 @@ use crate::processed::model::BlockModel;
 pub mod animation;
 pub mod atlas;
 pub mod model;
+pub mod entity_model;
 
 #[derive(Debug, Clone)]
 pub struct VariantDesc {
 
@@ -1,3 +1,4 @@
 pub(crate) mod atlas;
 pub(crate) mod block_state;
 pub(crate) mod model;
+pub(crate) mod entity_model;
@@ -9,32 +9,33 @@ use crate::terrain::WorldUniform;
 
 #[repr(C)]
 pub struct PC {
-    model: Mat4,
     texture: u32,
+    transform_offset: u32,
 }
 #[spirv(vertex)]
 pub fn vert(
     #[spirv(descriptor_set = 0, binding = 0, uniform)] uniform: &WorldUniform,
+    #[spirv(descriptor_set = 0, binding = 1, storage_buffer)] transforms: &[Mat4],
     #[spirv(push_constant)] pc: &PC,
 
     in_pos: Vec3,
-    _in_transform_id: u32,
+    in_transform_id: u32,
     in_uv: Vec2,
 
     out_uv: &mut Vec2,
     out_texture: &mut u32,
 
     #[spirv(position)] out_pos: &mut Vec4,
 ) {
-    *out_pos = uniform.view_proj * pc.model * in_pos.extend(1.0);
+    *out_pos = uniform.view_proj * transforms[in_transform_id as usize + pc.transform_offset as usize] * in_pos.extend(1.0);
     *out_uv = in_uv;
     *out_texture = pc.texture;
 }
 
 #[spirv(fragment)]
 pub fn frag(
     in_uv: Vec2,
-    #[spirv(flat)]in_tex: u32,
+    #[spirv(flat)] in_tex: u32,
     #[spirv(descriptor_set = 1, binding = 0)] textures: &RuntimeArray<
         SampledImage<Image!(2D, type=f32, sampled)>,
     >,