Texture thingy

9 files changed, 153 insertions, 142 deletions

diff --git a/assets/images/Samantha1.png b/assets/images/Samantha1.png
new file mode 100644
index 0000000..29c6543
--- /dev/null
+++ b/assets/images/Samantha1.png
diff --git a/assets/models/Samantha.mtl b/assets/models/Samantha.mtl
index 924a49b..60d911e 100644
--- a/assets/models/Samantha.mtl
+++ b/assets/models/Samantha.mtl
@@ -9,4 +9,4 @@ Ke 0.000000 0.000000 0.000000
 Ni 1.500000
 d 1.000000
 illum 3
-
+map_Kd Samantha.png
diff --git a/assets/models/Samantha.obj b/assets/models/Samantha.obj
index 4cc9d84..d426447 100644
--- a/assets/models/Samantha.obj
+++ b/assets/models/Samantha.obj
@@ -2,140 +2,140 @@
 # www.blender.org
 mtllib Samantha.mtl
 o Samantha
-v -1.972166 -11.956329 -0.999999
-v -1.458015 -3.158478 -0.999999
-v -1.190335 -11.956329 -0.623488
-v -0.676184 -3.158478 -0.623489
-v -0.997239 -11.956329 0.222522
-v -0.483087 -3.158478 0.222521
-v -1.538283 -11.956329 0.900970
-v -1.024131 -3.158478 0.900969
-v -2.406050 -11.956329 0.900970
-v -1.891899 -3.158478 0.900969
-v -2.947094 -11.956329 0.222522
-v -2.432943 -3.158478 0.222521
-v -2.753998 -11.956329 -0.623488
-v -2.239846 -3.158478 -0.623489
-v 3.813954 -11.956328 -0.999998
-v 3.299803 -3.158478 -0.999999
-v 3.032123 -11.956328 -0.623488
-v 2.517972 -3.158478 -0.623489
-v 2.839026 -11.956328 0.222522
-v 2.324875 -3.158478 0.222521
-v 3.380071 -11.956328 0.900970
-v 2.865919 -3.158478 0.900969
-v 4.247838 -11.956328 0.900970
-v 3.733686 -3.158478 0.900969
-v 4.788882 -11.956328 0.222522
-v 4.274731 -3.158478 0.222521
-v 4.595786 -11.956328 -0.623488
-v 4.081634 -3.158478 -0.623489
-v -10.899803 3.373667 -0.944896
-v -4.661469 4.524753 -0.944896
-v -10.899803 2.634919 -0.589133
-v -4.661469 3.786004 -0.589133
-v -10.899803 2.452463 0.210259
-v -4.661469 3.603549 0.210258
-v -10.899803 2.963693 0.851321
-v -4.661469 4.114778 0.851321
-v -10.899803 3.783642 0.851321
-v -4.661469 4.934728 0.851321
-v -10.899803 4.294872 0.210259
-v -4.661469 5.445958 0.210258
-v -10.899803 4.112417 -0.589133
-v -4.661469 5.263502 -0.589133
-v 12.741590 3.373668 -0.944896
-v 6.503256 4.524753 -0.944896
-v 12.741590 2.634919 -0.589133
-v 6.503256 3.786005 -0.589133
-v 12.741590 2.452463 0.210259
-v 6.503256 3.603549 0.210258
-v 12.741590 2.963693 0.851321
-v 6.503256 4.114778 0.851320
-v 12.741590 3.783642 0.851321
-v 6.503256 4.934727 0.851320
-v 12.741590 4.294872 0.210259
-v 6.503256 5.445958 0.210258
-v 12.741590 4.112416 -0.589133
-v 6.503256 5.263502 -0.589133
-v 0.920894 -4.903786 -0.000000
-v 5.643468 -0.741175 3.431110
-v -0.882934 -0.741178 5.551704
-v -4.916518 -0.741146 -0.000000
-v -0.882934 -0.741178 -5.551705
-v 5.643468 -0.741175 -3.431111
-v 2.724722 5.994235 5.551704
-v -3.801680 5.994232 3.431110
-v -3.801680 5.994232 -3.431111
-v 2.724722 5.994235 -5.551705
-v 6.758307 5.994202 -0.000000
-v 0.920894 10.156843 -0.000000
-v -0.139361 -3.779167 3.263185
-v 3.696734 -3.779165 2.016742
-v 2.636490 -1.332442 5.279959
-v 6.472590 -1.332428 -0.000000
-v 3.696734 -3.779165 -2.016742
-v -2.510246 -3.779146 -0.000000
-v -3.570528 -1.332431 3.263196
-v -0.139361 -3.779167 -3.263186
-v -3.570528 -1.332431 -3.263197
-v 2.636490 -1.332442 -5.279960
-v 7.127909 2.626528 2.016750
-v 7.127909 2.626528 -2.016751
-v 0.920894 2.626528 6.526432
-v 4.757037 2.626528 5.279993
-v -5.286121 2.626528 2.016750
-v -2.915249 2.626528 5.279993
-v -2.915249 2.626528 -5.279994
-v -5.286121 2.626528 -2.016751
-v 4.757037 2.626528 -5.279994
-v 0.920894 2.626528 -6.526433
-v 5.412316 6.585487 3.263196
-v -0.794701 6.585498 5.279959
-v -4.630802 6.585485 -0.000000
-v -0.794701 6.585498 -5.279960
-v 5.412316 6.585487 -3.263197
-v 1.981149 9.032223 3.263185
-v 4.352034 9.032204 -0.000000
-v -1.854946 9.032223 2.016742
-v -1.854946 9.032223 -2.016742
-v 1.981149 9.032223 -3.263186
-v -1.779402 3.104403 -3.596552
-v 0.057662 4.507804 -2.261863
-v -2.481083 4.507804 -1.436961
-v -4.050153 4.507804 -3.596552
-v -2.481083 4.507804 -5.756143
-v 0.057662 4.507804 -4.931242
-v -1.077720 6.778568 -1.436961
-v -3.616466 6.778568 -2.261863
-v -3.616466 6.778568 -4.931242
-v -1.077720 6.778568 -5.756143
-v 0.491350 6.778568 -3.596552
-v -1.779402 8.181971 -3.596552
-v 3.621190 3.104402 -3.596552
-v 1.784126 4.507803 -2.261863
-v 4.322872 4.507803 -1.436961
-v 5.891941 4.507803 -3.596552
-v 4.322872 4.507803 -5.756143
-v 1.784126 4.507803 -4.931242
-v 2.919508 6.778568 -1.436961
-v 5.458253 6.778568 -2.261863
-v 5.458253 6.778568 -4.931242
-v 2.919508 6.778568 -5.756143
-v 1.350438 6.778568 -3.596552
-v 3.621190 8.181969 -3.596552
-v 0.589381 8.451481 0.000000
-v 3.530943 10.698650 2.137145
-v -0.534173 10.698650 3.458002
-v -3.046614 10.698650 0.000000
-v -0.534173 10.698650 -3.458002
-v 3.530943 10.698650 -2.137145
-v 1.712935 14.334667 3.458002
-v -2.352180 14.334667 2.137145
-v -2.352180 14.334667 -2.137145
-v 1.712935 14.334667 -3.458002
-v 4.225378 14.334667 0.000000
-v 0.589381 16.581837 0.000000
+v -2.863373 -14.157234 -0.355840
+v -2.349221 -5.359383 -0.355841
+v -2.081541 -14.157234 0.020670
+v -1.567390 -5.359383 0.020669
+v -1.888445 -14.157234 0.866681
+v -1.374293 -5.359383 0.866680
+v -2.429489 -14.157234 1.545129
+v -1.915337 -5.359383 1.545128
+v -3.297256 -14.157234 1.545129
+v -2.783105 -5.359383 1.545128
+v -3.838300 -14.157234 0.866681
+v -3.324149 -5.359383 0.866680
+v -3.645204 -14.157234 0.020670
+v -3.131053 -5.359383 0.020669
+v 2.922748 -14.157233 -0.355840
+v 2.408597 -5.359383 -0.355841
+v 2.140916 -14.157233 0.020670
+v 1.626765 -5.359383 0.020669
+v 1.947820 -14.157233 0.866681
+v 1.433669 -5.359383 0.866680
+v 2.488864 -14.157233 1.545129
+v 1.974713 -5.359383 1.545128
+v 3.356632 -14.157233 1.545129
+v 2.842480 -5.359383 1.545128
+v 3.897676 -14.157233 0.866681
+v 3.383524 -5.359383 0.866680
+v 3.704579 -14.157233 0.020670
+v 3.190428 -5.359383 0.020669
+v -11.791010 1.172762 -0.300737
+v -5.552674 2.323848 -0.300737
+v -11.791010 0.434014 0.055025
+v -5.552674 1.585099 0.055025
+v -11.791010 0.251558 0.854417
+v -5.552674 1.402643 0.854417
+v -11.791010 0.762788 1.495479
+v -5.552674 1.913873 1.495479
+v -11.791010 1.582737 1.495479
+v -5.552674 2.733823 1.495479
+v -11.791010 2.093967 0.854417
+v -5.552674 3.245053 0.854417
+v -11.791010 1.911512 0.055025
+v -5.552674 3.062597 0.055025
+v 11.850384 1.172763 -0.300737
+v 5.612050 2.323848 -0.300737
+v 11.850384 0.434014 0.055026
+v 5.612050 1.585099 0.055025
+v 11.850384 0.251558 0.854417
+v 5.612050 1.402643 0.854417
+v 11.850384 0.762788 1.495479
+v 5.612050 1.913873 1.495479
+v 11.850384 1.582737 1.495479
+v 5.612050 2.733822 1.495479
+v 11.850384 2.093967 0.854417
+v 5.612050 3.245053 0.854417
+v 11.850384 1.911511 0.055026
+v 5.612050 3.062597 0.055025
+v 0.029688 -7.104691 0.644158
+v 4.752262 -2.942080 4.075269
+v -1.774140 -2.942083 6.195863
+v -5.807724 -2.942051 0.644158
+v -1.774140 -2.942083 -4.907547
+v 4.752262 -2.942080 -2.786952
+v 1.833516 3.793329 6.195863
+v -4.692886 3.793327 4.075269
+v -4.692886 3.793327 -2.786952
+v 1.833516 3.793329 -4.907547
+v 5.867101 3.793297 0.644158
+v 0.029688 7.955938 0.644158
+v -1.030567 -5.980072 3.907343
+v 2.805528 -5.980070 2.660900
+v 1.745284 -3.533347 5.924118
+v 5.581384 -3.533334 0.644158
+v 2.805528 -5.980070 -1.372584
+v -3.401452 -5.980051 0.644158
+v -4.461734 -3.533336 3.907354
+v -1.030567 -5.980072 -2.619027
+v -4.461734 -3.533336 -2.619038
+v 1.745284 -3.533347 -4.635801
+v 6.236703 0.425623 2.660908
+v 6.236703 0.425623 -1.372592
+v 0.029688 0.425623 7.170590
+v 3.865831 0.425623 5.924151
+v -6.177327 0.425623 2.660908
+v -3.806455 0.425623 5.924151
+v -3.806455 0.425623 -4.635835
+v -6.177327 0.425623 -1.372592
+v 3.865831 0.425623 -4.635835
+v 0.029688 0.425623 -5.882274
+v 4.521110 4.384582 3.907354
+v -1.685908 4.384593 5.924118
+v -5.522008 4.384580 0.644158
+v -1.685908 4.384593 -4.635801
+v 4.521110 4.384582 -2.619038
+v 1.089943 6.831318 3.907343
+v 3.460828 6.831298 0.644158
+v -2.746152 6.831317 2.660900
+v -2.746152 6.831317 -1.372584
+v 1.089943 6.831318 -2.619027
+v -2.670608 0.903497 -2.952394
+v -0.833544 2.306899 -1.617704
+v -3.372290 2.306899 -0.792803
+v -4.941360 2.306899 -2.952394
+v -3.372290 2.306899 -5.111984
+v -0.833544 2.306899 -4.287083
+v -1.968926 4.577663 -0.792803
+v -4.507671 4.577663 -1.617704
+v -4.507671 4.577663 -4.287083
+v -1.968926 4.577663 -5.111984
+v -0.399857 4.577663 -2.952394
+v -2.670608 5.981065 -2.952394
+v 2.729983 0.903497 -2.952394
+v 0.892920 2.306898 -1.617704
+v 3.431665 2.306898 -0.792803
+v 5.000735 2.306898 -2.952394
+v 3.431665 2.306898 -5.111984
+v 0.892920 2.306898 -4.287083
+v 2.028302 4.577663 -0.792803
+v 4.567047 4.577663 -1.617704
+v 4.567047 4.577663 -4.287083
+v 2.028302 4.577663 -5.111984
+v 0.459232 4.577663 -2.952394
+v 2.729983 5.981064 -2.952394
+v -0.301825 6.250576 0.644159
+v 2.639737 8.497746 2.781303
+v -1.425379 8.497746 4.102160
+v -3.937821 8.497746 0.644159
+v -1.425379 8.497746 -2.813843
+v 2.639737 8.497746 -1.492986
+v 0.821729 12.133762 4.102160
+v -3.243387 12.133762 2.781303
+v -3.243387 12.133762 -1.492986
+v 0.821729 12.133762 -2.813843
+v 3.334171 12.133762 0.644159
+v -0.301825 14.380932 0.644159
 vn -0.0126 -0.6209 -0.7838
 vn 0.0126 0.6209 -0.7838
 vn 0.5970 -0.6382 -0.4862
diff --git a/blender/Samantha.blend b/blender/Samantha.blend
index b9a67a0..da0e431 100644
--- a/blender/Samantha.blend
+++ b/blender/Samantha.blend
diff --git a/blender/Samantha.blend1 b/blender/Samantha.blend1
new file mode 100644
index 0000000..58d0c97
--- /dev/null
+++ b/blender/Samantha.blend1
diff --git a/src/assets.c b/src/assets.c
index c6efaeb..3eb0a8a 100644
--- a/src/assets.c
+++ b/src/assets.c
@@ -5,7 +5,8 @@ const char textureAssetPaths[TEXTURE_ASSET_COUNT][FT_NAMEMAX] = {
   "nickel.png",
   "tree.png",
   "bush.png",
-  "flower.png"
+  "flower.png",
+  "Samantha.png"
 };
 
 const char imageAssetPaths[IMAGE_ASSET_COUNT][FT_NAMEMAX] = {
@@ -34,6 +35,12 @@ void initShaderAssets(Shader shaders[SHADER_ASSET_COUNT])
   shader.locs[SHADER_LOC_MATRIX_MVP] = GetShaderLocation(shader, "mvp");
 }
 
+void initModelAssets(Assets* assets)
+{
+  assets->models[SAMANTHA_MODEL].materials[0]
+    .maps[MATERIAL_MAP_DIFFUSE].texture = assets->textures[SAMANTHA_TEXTURE];
+}  
+
 void initAssets(Assets* assets)
 {
   // Textures.
@@ -68,6 +75,8 @@ void initAssets(Assets* assets)
     assets->models[index] = LoadModel(
       TextFormat("assets/models/%s", modelAssetPaths[index]));
   }
+
+  initModelAssets(assets);
 }
 
 void closeAssets(Assets* assets)
diff --git a/src/assets.h b/src/assets.h
index 8404cd2..c2906c9 100644
--- a/src/assets.h
+++ b/src/assets.h
@@ -3,7 +3,7 @@
 #ifndef ASSETS_H
 #define ASSETS_H
 
-#define TEXTURE_ASSET_COUNT 5
+#define TEXTURE_ASSET_COUNT 6
 #define IMAGE_ASSET_COUNT 1
 #define SHADER_ASSET_COUNT 2
 #define MODEL_ASSET_COUNT 2
@@ -22,6 +22,7 @@ enum {
   TREE_TEXTURE,
   BUSH_TEXTURE,
   FLOWER_TEXTURE,
+  SAMANTHA_TEXTURE
 };
 
 // Image asset ids.
diff --git a/src/entity.c b/src/entity.c
index 8017de0..1548968 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -51,8 +51,8 @@ Entity createEntity(EntityId id, Vector3 position)
     break;
   case SAMANTHA:
     entity.box = (BoundingBox){
-      .min = (Vector3){-SAMANTHA_WIDTH, -SAMANTHA_HEIGHT, -SAMANTHA_WIDTH},
-      .max = (Vector3){SAMANTHA_WIDTH, SAMANTHA_HEIGHT, SAMANTHA_WIDTH}
+      .min = (Vector3){-SAMANTHA_WIDTH, -SAMANTHA_HEIGHT, -SAMANTHA_THICKNESS},
+      .max = (Vector3){SAMANTHA_WIDTH, SAMANTHA_HEIGHT, SAMANTHA_THICKNESS}
     };
 
     break;
@@ -68,7 +68,7 @@ Entity createEntity(EntityId id, Vector3 position)
 // TODO: Mesh instance the utility poles and make a 3d model
 void updateEntity(Entity* entity, Game* game)
 {
-  // DrawBoundingBox(entity->box, RED);
+  DrawBoundingBox(entity->box, RED);
   
   switch (entity->id)
   {
diff --git a/src/entity.h b/src/entity.h
index 3a2fd15..934efa3 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -17,8 +17,9 @@
 #define UTILITY_POLE_HEIGHT 100.0
 #define UTILITY_POLE_RADIUS 3.0
 
-#define SAMANTHA_WIDTH 1.0
-#define SAMANTHA_HEIGHT 1.0
+#define SAMANTHA_WIDTH 23.6414/2.0
+#define SAMANTHA_HEIGHT 28.5382/2.0
+#define SAMANTHA_THICKNESS 13.0529/2.0
 
 typedef int8_t EntityId;