diff --git a/example/example.mk b/example/example.mk index cbe3437..571d1f8 100644 --- a/example/example.mk +++ b/example/example.mk @@ -936,8 +936,8 @@ MOAI_OBJ = \ example/moai.elf: LDSCRIPT = $(LIB)/main.lds example/moai.elf: $(START_OBJ) $(MOAI_OBJ) -FEMALE_OBJ = \ - example/female.o \ +HAUNTED_MANSION_OBJ = \ + example/haunted_mansion.o \ holly/core.o \ holly/region_array.o \ holly/background.o \ @@ -947,8 +947,8 @@ FEMALE_OBJ = \ maple/maple.o \ $(LIBGCC) -example/female.elf: LDSCRIPT = $(LIB)/main.lds -example/female.elf: $(START_OBJ) $(FEMALE_OBJ) +example/haunted_mansion.elf: LDSCRIPT = $(LIB)/main.lds +example/haunted_mansion.elf: $(START_OBJ) $(HAUNTED_MANSION_OBJ) BEAR_OBJ = \ example/bear.o \ diff --git a/example/female.cpp b/example/haunted_mansion.cpp similarity index 99% rename from example/female.cpp rename to example/haunted_mansion.cpp index 7c7f017..f489aeb 100644 --- a/example/female.cpp +++ b/example/haunted_mansion.cpp @@ -43,11 +43,11 @@ using vec4 = vec<4, float>; using mat4x4 = mat<4, 4, float>; #include "model/model.h" -#include "model/female/material.h" -#include "model/female/model.h" -#include "model/female/model_mansion.h" -#include "model/female/model_cone.h" -#include "model/female/model_cube.h" +#include "model/haunted_mansion/material.h" +#include "model/haunted_mansion/model_female.h" +#include "model/haunted_mansion/model_mansion.h" +#include "model/haunted_mansion/model_cone.h" +#include "model/haunted_mansion/model_cube.h" void vbr100() { diff --git a/model/female/cube.obj b/model/haunted_mansion/cube.obj similarity index 100% rename from model/female/cube.obj rename to model/haunted_mansion/cube.obj diff --git a/model/female/femaleBaseMeshDC.obj b/model/haunted_mansion/femaleBaseMeshDC.obj similarity index 100% rename from model/female/femaleBaseMeshDC.obj rename to model/haunted_mansion/femaleBaseMeshDC.obj diff --git a/model/female/femaleBaseMeshDCSmooth.mtl b/model/haunted_mansion/femaleBaseMeshDCSmooth.mtl similarity index 100% rename from model/female/femaleBaseMeshDCSmooth.mtl rename to model/haunted_mansion/femaleBaseMeshDCSmooth.mtl diff --git a/model/female/femaleBaseMeshDCSmooth.obj b/model/haunted_mansion/femaleBaseMeshDCSmooth.obj similarity index 100% rename from model/female/femaleBaseMeshDCSmooth.obj rename to model/haunted_mansion/femaleBaseMeshDCSmooth.obj diff --git a/model/female/hauntedMansion.obj b/model/haunted_mansion/hauntedMansion.obj similarity index 100% rename from model/female/hauntedMansion.obj rename to model/haunted_mansion/hauntedMansion.obj diff --git a/model/female/lightCone.obj b/model/haunted_mansion/lightCone.obj similarity index 100% rename from model/female/lightCone.obj rename to model/haunted_mansion/lightCone.obj diff --git a/model/female/material.h b/model/haunted_mansion/material.h similarity index 100% rename from model/female/material.h rename to model/haunted_mansion/material.h diff --git a/model/female/model_cone.h b/model/haunted_mansion/model_cone.h similarity index 100% rename from model/female/model_cone.h rename to model/haunted_mansion/model_cone.h diff --git a/model/female/model_cube.h b/model/haunted_mansion/model_cube.h similarity index 100% rename from model/female/model_cube.h rename to model/haunted_mansion/model_cube.h diff --git a/model/female/model.h b/model/haunted_mansion/model_female.h similarity index 100% rename from model/female/model.h rename to model/haunted_mansion/model_female.h diff --git a/model/female/model_mansion.h b/model/haunted_mansion/model_mansion.h similarity index 100% rename from model/female/model_mansion.h rename to model/haunted_mansion/model_mansion.h