zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZoneCode: Fix Commands for Material, GfxImage and Techset

Browse Source
This commit is contained in:
Jan 2019-12-23 17:03:16 +01:00
parent db08cf5ebc
commit 8d8f60bf41
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ZoneCode/Game/T6/T6_Commands.txt
View File

@ -294,9 +294,9 @@ set count stateBitsTable stateBitsCount;
// GfxStateBits // GfxStateBits
use GfxStateBits; use GfxStateBits;
set count blendState 0; set condition blendState never;
set count depthStencilState 0; set condition depthStencilState never;
set count rasterizerState 0; set condition rasterizerState never;
// ========================================= // =========================================
// MaterialTechniqueSet // MaterialTechniqueSet
@ -327,13 +327,13 @@ reorder:
args; args;
// MaterialVertexStreamRouting // MaterialVertexStreamRouting
set count MaterialVertexStreamRouting::decl 0; set condition MaterialVertexStreamRouting::decl never;
// MaterialVertexShader // MaterialVertexShader
set string MaterialVertexShader::name; set string MaterialVertexShader::name;
// MaterialVertexShaderProgram // MaterialVertexShaderProgram
set count MaterialVertexShaderProgram::vs 0; set condition MaterialVertexShaderProgram::vs never;
// GfxVertexShaderLoadDef // GfxVertexShaderLoadDef
set count GfxVertexShaderLoadDef::program programSize; set count GfxVertexShaderLoadDef::program programSize;
@ -342,7 +342,7 @@ set count GfxVertexShaderLoadDef::program programSize;
set string MaterialPixelShader::name; set string MaterialPixelShader::name;
// MaterialPixelShaderProgram // MaterialPixelShaderProgram
set count MaterialPixelShaderProgram::ps 0; set condition MaterialPixelShaderProgram::ps never;
// GfxPixelShaderLoadDef // GfxPixelShaderLoadDef
set count GfxPixelShaderLoadDef::program programSize; set count GfxPixelShaderLoadDef::program programSize;
@ -359,6 +359,7 @@ set reusable u::literalConst;
use GfxImage; use GfxImage;
set string name; set string name;
set name name; set name name;
set condition pixels never;
reorder: reorder:
name name
texture; texture;

2
src/ZoneCommon/Game/T6/T6_Assets.h
View File

@ -2664,7 +2664,7 @@ namespace T6
}; };
struct MaterialConstantDef struct __declspec(align(16)) MaterialConstantDef
{ {
unsigned int nameHash; unsigned int nameHash;
char name[12]; char name[12];