abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
8a0e47fdd6
0ad/source/graphics/MaterialManager.cpp

74 lines
2.0 KiB
C++
Raw Normal View History

Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
/* Copyright (C) 2012 Wildfire Games.
Add GPL header This was SVN commit r6830.
2009-04-18 19:00:33 +02:00
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
#include "precompiled.h"
Simplification of #Include paths: relative names are used only for included files in the same directory as the including file; everything else uses the full path relative to source/. This was SVN commit r3930.
2006-06-02 04:10:27 +02:00
#include "lib/ogl.h"
less global variables: make most uses of g_VFS explicit (required for another app that has two VFSes), g_yres is no longer required by cursor module This was SVN commit r7686.
2010-07-04 12:15:53 +02:00
#include "ps/Filesystem.h"
Simplification of #Include paths: relative names are used only for included files in the same directory as the including file; everything else uses the full path relative to source/. This was SVN commit r3930.
2006-06-02 04:10:27 +02:00
#include "ps/XML/Xeromyces.h"
Update to the material system This was SVN commit r1193.
2004-09-23 07:10:03 +02:00
#include "MaterialManager.h"
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
CMaterial CMaterialManager::LoadMaterial(const VfsPath& pathname)
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
{
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
if (pathname.empty())
return CMaterial();
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
std::map<VfsPath, CMaterial>::iterator iter = m_Materials.find(pathname);
if (iter != m_Materials.end())
return iter->second;
Update to the material system This was SVN commit r1193.
2004-09-23 07:10:03 +02:00
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
CXeromyces xeroFile;
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
if (xeroFile.Load(g_VFS, pathname) != PSRETURN_OK)
return CMaterial();
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
# SwEng . the massive renaming undertaking: camelCase functions -> PascalCase. . add some cppdoc. . minor additional renaming improvements: e.g. GetIsClosed -> IsClosed . in entity code, replace constructs like "pvec = new vector; return pvec; use *pvec; delete pvec" with a simple stack variable passed as output parameter (avoid unnecessary dynamic allocs) . timer: simpler handling of raw ticks vs normal timer (less #if) This was SVN commit r5017.
2007-05-02 14:07:08 +02:00
#define EL(x) int el_##x = xeroFile.GetElementID(#x)
#define AT(x) int at_##x = xeroFile.GetAttributeID(#x)
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
EL(alpha_blending);
EL(define);
EL(shader);
AT(effect);
AT(name);
AT(value);
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
#undef AT
#undef EL
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
CMaterial material;
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
XMBElement root = xeroFile.GetRoot();
XMBElementList childNodes = root.GetChildNodes();
XERO_ITER_EL(root, node)
{
int token = node.GetNodeName();
XMBAttributeList attrs = node.GetAttributes();
if (token == el_alpha_blending)
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
{
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
material.SetUsesAlphaBlending(true);
}
else if (token == el_shader)
{
material.SetShaderEffect(attrs.GetNamedItem(at_effect));
}
else if (token == el_define)
{
material.AddShaderDefine(attrs.GetNamedItem(at_name).c_str(), attrs.GetNamedItem(at_value).c_str());
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them. This was SVN commit r1192.
2004-09-23 06:00:56 +02:00
}
}
Update renderer design to be more flexible and data-driven based on material and shader definitions. Support conditional expressions in shader effect XML files. Consolidate fixed-function model rendering into the shader system. Remove lots of now-obsolete renderer code. Move shader defines from std::map to new class with interned data, for performance. Move texture from model into material. Alleviate singletonitis. Remove obsolete lodbias setting. Remove unused terrain shadow transparency. This was SVN commit r11423.
2012-04-03 20:44:46 +02:00
m_Materials[pathname] = material;
return material;
Minor fixes for Linux/GCC This was SVN commit r1201.
2004-09-26 23:21:34 +02:00
}
Copy Permalink