Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate materials

This commit is contained in:
halx99 2023-07-23 21:43:25 +08:00
parent c675e15a92
commit 5a0838e52b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/renderer/Material.cpp
View File

@ -74,6 +74,7 @@ static bool isValidUniform(const char* name);
Material* Material::createWithFilename(std::string_view filepath) Material* Material::createWithFilename(std::string_view filepath)
{ {
AXLOG("Loading material: %s", filepath.data());
auto validfilename = FileUtils::getInstance()->fullPathForFilename(filepath); auto validfilename = FileUtils::getInstance()->fullPathForFilename(filepath);
if (!validfilename.empty()) if (!validfilename.empty())
{ {
@ -377,10 +378,11 @@ bool Material::parseShader(Pass* pass, Properties* shaderProperties)
auto vertShaderSrc = fu->getStringFromFile(vertShader); auto vertShaderSrc = fu->getStringFromFile(vertShader);
auto fragShaderSrc = fu->getStringFromFile(fragShader); auto fragShaderSrc = fu->getStringFromFile(fragShader);
auto defs = replaceDefines(compileTimeDefines); //since axmol-1.1 no longer support compile time defines
//auto defs = replaceDefines(compileTimeDefines);
vertShaderSrc = defs + "\n" + vertShaderSrc; //vertShaderSrc = defs + "\n" + vertShaderSrc;
fragShaderSrc = defs + "\n" + fragShaderSrc; //fragShaderSrc = defs + "\n" + fragShaderSrc;
auto* program = backend::Device::getInstance()->newProgram(vertShaderSrc, fragShaderSrc); auto* program = backend::Device::getInstance()->newProgram(vertShaderSrc, fragShaderSrc);
auto programState = new backend::ProgramState(program); auto programState = new backend::ProgramState(program);