|
|
@ -228,6 +228,9 @@ void NIFLoader::createMaterial(const String &name,
|
|
|
|
int alphaFlags, float alphaTest,
|
|
|
|
int alphaFlags, float alphaTest,
|
|
|
|
const String &texName)
|
|
|
|
const String &texName)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
if (texName.empty())
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
sh::MaterialInstance* instance = sh::Factory::getInstance ().createMaterialInstance (name, "openmw_objects_base");
|
|
|
|
sh::MaterialInstance* instance = sh::Factory::getInstance ().createMaterialInstance (name, "openmw_objects_base");
|
|
|
|
instance->setProperty ("ambient", sh::makeProperty<sh::Vector3> (
|
|
|
|
instance->setProperty ("ambient", sh::makeProperty<sh::Vector3> (
|
|
|
|
new sh::Vector3(ambient.array[0], ambient.array[1], ambient.array[2])));
|
|
|
|
new sh::Vector3(ambient.array[0], ambient.array[1], ambient.array[2])));
|
|
|
@ -243,7 +246,6 @@ void NIFLoader::createMaterial(const String &name,
|
|
|
|
|
|
|
|
|
|
|
|
instance->setProperty ("diffuseMap", sh::makeProperty(texName));
|
|
|
|
instance->setProperty ("diffuseMap", sh::makeProperty(texName));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
if (!texName.empty())
|
|
|
|
if (!texName.empty())
|
|
|
|
{
|
|
|
|
{
|
|
|
|