gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

More programmable pipeline updates

Browse Source 
This was SVN commit r1280.
This commit is contained in:
Calefaction
2004-10-30 21:57:46 +00:00
parent 2cf79ca6cf
commit 955ddcf9a1
14 changed files with 143 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/MaterialManager.cpp
+12
View File
@@ -186,6 +186,8 @@ CMaterial &CMaterialManager::LoadMaterial(const char *file)
#define EL(x) int el_##x = xeroFile.getElementID(#x)
#define AT(x) int at_##x = xeroFile.getAttributeID(#x)
EL(texture);
EL(vertexprogram);
EL(fragmentprogram);
EL(colors);
AT(diffuse);
@@ -218,6 +220,16 @@ CMaterial &CMaterialManager::LoadMaterial(const char *file)
CStr value(node.getText());
material->SetTexture(value);
}
else if(token == el_vertexprogram)
{
CStr value(node.getText());
material->SetVertexProgram(value);
}
else if(token == el_fragmentprogram)
{
CStr value(node.getText());
material->SetFragmentProgram(value);
}
else if(token == el_colors)
{