From 81edb47b7f677ba37e81f896645ecdc023f4adb9 Mon Sep 17 00:00:00 2001 From: megazig Date: Wed, 11 Jan 2012 01:45:32 -0600 Subject: changed class1EC to collisionMgr class changed class484 to freezeMgr class added daEnDosun_c definition fixed bossMegaGecko to use new collisionMgr class changed bossThwompaDomp to inherit from daEnDosun_c (need to make it actually different now) --- include/g3dhax.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'include/g3dhax.h') diff --git a/include/g3dhax.h b/include/g3dhax.h index d4aa9a0..f13aab3 100644 --- a/include/g3dhax.h +++ b/include/g3dhax.h @@ -29,6 +29,7 @@ namespace nw4r { }; class ResAnmChr { public: void* data; ResAnmChr(void *p = NULL) { data = p; } }; + class ResAnmVis { public: void* data; ResAnmVis(void *p = NULL) { data = p; } }; class ResAnmTexPat { public: void* data; ResAnmTexPat(void *p = NULL) { data = p; } }; class ResAnmTexSrt { public: void* data; ResAnmTexSrt(void *p = NULL) { data = p; } }; @@ -49,7 +50,7 @@ namespace nw4r { void * /*ResTex*/ GetResTex(const ResName n) const; void * /*ResTex*/ GetResTex(u32 idx) const; ResAnmChr GetResAnmChr(const char *str) const; - void * /*ResAnmVis*/ GetResAnmVis(const char *str) const; + ResAnmVis GetResAnmVis(const char *str) const; void * /*ResAnmClr*/ GetResAnmClr(const char *str) const; ResAnmTexPat GetResAnmTexPat(const char *str) const; ResAnmTexSrt GetResAnmTexSrt(const char *str) const; @@ -279,7 +280,7 @@ namespace m3d { // 28 might be Max Frame? float _28, _2C, currentFrame; - u8 _34; + u8 _34; // animation group?? }; class anmChr_c : public fanm_c { @@ -293,6 +294,17 @@ namespace m3d { void bind(/*b*/mdl_c *model, nw4r::g3d::ResAnmChr anmRes, int unk); }; + class anmVis_c : public fanm_c { + public: + ~anmVis_c(); + int _vf0C(); + + bool setup(nw4r::g3d::ResMdl modelRes, nw4r::g3d::ResAnmVis anmRes, + mAllocator_c *allocator, u32 *sizeOutPtr); + + void bind(/*b*/mdl_c *model, nw4r::g3d::ResAnmVis anmRes, int unk); + }; + class anmTexPat_c : public banm_c { public: class child_c : public fanm_c { -- cgit v1.2.3