ZoneCommon: Add Texture pointer from OAT to GfxTexture union of T6 to be able to save loaded texture data in GfxImage

This commit is contained in:
Jan 2020-02-07 20:54:40 +01:00
parent b210661ac8
commit 589347ce08
4 changed files with 6 additions and 1 deletions

View File

@ -40,6 +40,9 @@ typedef void ID3D11VertexShader;
typedef void ID3D11InputLayout; typedef void ID3D11InputLayout;
typedef void ID3D11Buffer; typedef void ID3D11Buffer;
// OAT Types
typedef void Texture;
// Unimportant cpp keywords // Unimportant cpp keywords
#define __unaligned #define __unaligned
#define volatile #define volatile

View File

@ -376,6 +376,7 @@ use GfxTexture;
set reusable loadDef; set reusable loadDef;
set block loadDef XFILE_BLOCK_TEMP; set block loadDef XFILE_BLOCK_TEMP;
set condition basemap never; set condition basemap never;
set condition texture never;
// GfxImageLoadDef // GfxImageLoadDef
use GfxImageLoadDef; use GfxImageLoadDef;

View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <d3d11.h> #include <d3d11.h>
#include "Image/Texture.h"
#include "T6_Assets.h" #include "T6_Assets.h"
@ -18,7 +19,6 @@ namespace T6
XAssetHeader header; XAssetHeader header;
}; };
struct XAssetList struct XAssetList
{ {
ScriptStringList stringList; ScriptStringList stringList;

View File

@ -696,6 +696,7 @@ namespace T6
union GfxTexture union GfxTexture
{ {
ID3D11ShaderResourceView* basemap; ID3D11ShaderResourceView* basemap;
Texture* texture;
GfxImageLoadDef* loadDef; GfxImageLoadDef* loadDef;
}; };