Update CKTexture

Gamepiaynmo · Dec 31, 2020 · 43d0b54 · 43d0b54
1 parent 94bdcad
commit 43d0b54
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 44 deletions.
diff --git a/BuildVer.h b/BuildVer.h
@@ -1,3 +1,3 @@
 #define BML_MAJOR_VER 0
 #define BML_MINOR_VER 3
-#define BML_BUILD_VER 29
+#define BML_BUILD_VER 30
diff --git a/virtools/CKBitmapData.cpp b/virtools/CKBitmapData.cpp
@@ -28,10 +28,6 @@ NAKED CKBOOL CKBitmapData::ReleaseSurfacePtr(int Slot) {
 	JUMP(0x24030151);
 }
 
-NAKED CKBOOL CKBitmapData::FlushSurfacePtr(int Slot) {
-	UNDEFINED;
-}
-
 NAKED CKSTRING CKBitmapData::GetSlotFileName(int Slot) {
 	JUMP(0x24030170);
 }
@@ -152,14 +148,6 @@ NAKED CKBOOL CKBitmapData::HasOriginalFile() {
 	UNDEFINED;
 }
 
-NAKED void CKBitmapData::SetDesiredVideoFormat(VX_PIXELFORMAT pf) {
-	JUMPV(0x8c);
-}
-
-NAKED VX_PIXELFORMAT CKBitmapData::GetDesiredVideoFormat() {
-	UNDEFINED;
-}
-
 NAKED CKBOOL CKBitmapData::ResizeImages(int Width, int Height) {
 	JUMP(0x2403032E);
 }

diff --git a/virtools/CKBitmapData.h b/virtools/CKBitmapData.h
@@ -78,7 +78,6 @@ class BML_EXPORT CKBitmapData {
 	CKMovieReader* GetMovieReader();
 	CKBYTE* LockSurfacePtr(int Slot = -1);
 	CKBOOL ReleaseSurfacePtr(int Slot = -1);
-	CKBOOL FlushSurfacePtr(int Slot = -1);
 	CKSTRING GetSlotFileName(int Slot);
 	CKBOOL SetSlotFileName(int Slot, CKSTRING Filename);
 	int GetWidth();
@@ -109,8 +108,6 @@ class BML_EXPORT CKBitmapData {
 	void SetVolumeMap(CKBOOL VolumeMap);
 	CKBOOL IsVolumeMap();
 	CKBOOL HasOriginalFile();
-	void SetDesiredVideoFormat(VX_PIXELFORMAT pf);
-	VX_PIXELFORMAT GetDesiredVideoFormat();
 	CKBOOL ResizeImages(int Width, int Height);
 	void SetDynamicHint(CKBOOL Dynamic);
 	CKBOOL GetDynamicHint();

diff --git a/virtools/CKTexture.cpp b/virtools/CKTexture.cpp
@@ -56,34 +56,22 @@ NAKED CKBOOL CKTexture::GetSystemTextureDesc(VxImageDescEx& desc) {
 	JUMPV(0x88);
 }
 
-NAKED CKBOOL CKTexture::SetUserMipMapMode(CKBOOL UserMipmap) {
-	UNDEFINED;
+NAKED void CKTexture::SetDesiredVideoFormat(VX_PIXELFORMAT pf) {
+	JUMPV(0x8c);
 }
 
-NAKED BOOL CKTexture::GetUserMipMapLevel(int Level, VxImageDescEx& ResultImage) {
-	UNDEFINED;
-}
-
-NAKED int CKTexture::GetRstTextureIndex() {
-	UNDEFINED;
-}
-
-NAKED BOOL CKTexture::LockVideoMemory(VxImageDescEx& Surface, int MipLevel, VX_LOCKFLAGS Flags) {
-	UNDEFINED;
-}
-
-NAKED void CKTexture::UnlockVideoMemory(int MipLevel) {
-	UNDEFINED;
+NAKED VX_PIXELFORMAT CKTexture::GetDesiredVideoFormat() {
+	JUMPV(0x90);
 }
 
-NAKED BOOL CKTexture::VideoToSystemMemory() {
-	UNDEFINED;
+NAKED CKBOOL CKTexture::FlushSurfacePtr(int Slot) {
+	JUMPV(0x94);
 }
 
-NAKED void* CKTexture::GetRstTextureObject() {
-	UNDEFINED;
+NAKED BOOL CKTexture::GetUserMipMapLevel(int Level, VxImageDescEx& ResultImage) {
+	JUMPV(0x98);
 }
 
-NAKED BOOL CKTexture::EnsureVideoMemory(CKRenderContext* ctx, CKBOOL Clamping) {
-	UNDEFINED;
+NAKED int CKTexture::GetRstTextureIndex() {
+	JUMPV(0x9c);
 }
diff --git a/virtools/CKTexture.h b/virtools/CKTexture.h
@@ -23,14 +23,11 @@ class BML_EXPORT CKTexture : public CKBeObject, public CKBitmapData {
 	CKBOOL GetVideoTextureDesc(VxImageDescEx& desc);
 	VX_PIXELFORMAT GetVideoPixelFormat();
 	CKBOOL GetSystemTextureDesc(VxImageDescEx& desc);
-	CKBOOL SetUserMipMapMode(CKBOOL UserMipmap);
+	void SetDesiredVideoFormat(VX_PIXELFORMAT pf);
+	VX_PIXELFORMAT GetDesiredVideoFormat();
+	CKBOOL FlushSurfacePtr(int Slot = -1);
 	BOOL GetUserMipMapLevel(int Level, VxImageDescEx& ResultImage);
 	int GetRstTextureIndex();
-	BOOL LockVideoMemory(VxImageDescEx& Surface, int MipLevel, VX_LOCKFLAGS Flags = VX_LOCK_DEFAULT);
-	void UnlockVideoMemory(int MipLevel);
-	BOOL VideoToSystemMemory();
-	void* GetRstTextureObject();
-	BOOL EnsureVideoMemory(CKRenderContext* ctx, CKBOOL Clamping = FALSE);
 
 protected:
 	CKTexture() {};