AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-08-05 08:15:35 +00:00
Code Issues Projects Releases Wiki Activity

Additional data updates

Browse Source
This commit is contained in:
Jack Andersen 2015-09-27 20:16:41 -10:00
parent 6d1fb5470f
commit d59c649f2f
7 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataSpec/DNACommon/BabeDead.hpp
View File

@ -13,6 +13,7 @@ void ReadBabeDeadLightToBlender(HECL::BlenderConnection::PyOutStream& os,
switch (light.lightType)
{
case BabeDeadLight::LightLocalAmbient:
case BabeDeadLight::LightLocalAmbient2:
os.format("bg_node.inputs[0].default_value = (%f,%f,%f,1.0)\n"
"bg_node.inputs[1].default_value = %f\n",
light.color.vec[0], light.color.vec[1], light.color.vec[2],
@ -32,6 +33,7 @@ void ReadBabeDeadLightToBlender(HECL::BlenderConnection::PyOutStream& os,
"\n", s, l);
break;
case BabeDeadLight::LightSpot:
case BabeDeadLight::LightSpot2:
os.format("lamp = bpy.data.lamps.new('LAMP_%01u_%03u', 'SPOT')\n"
"lamp.spot_size = %f\n"
"lamp_obj = bpy.data.objects.new(lamp.name, lamp)\n"
@ -45,6 +47,7 @@ void ReadBabeDeadLightToBlender(HECL::BlenderConnection::PyOutStream& os,
}
os.format("lamp.retro_layer = %u\n"
"lamp.retro_origtype = %u\n"
"lamp.use_nodes = True\n"
"falloff_node = lamp.node_tree.nodes.new('ShaderNodeLightFalloff')\n"
"lamp.energy = 0.0\n"
@ -55,7 +58,7 @@ void ReadBabeDeadLightToBlender(HECL::BlenderConnection::PyOutStream& os,
"lamp.node_tree.links.new(hue_sat_node.outputs[0], lamp.node_tree.nodes['Emission'].inputs[0])\n"
"lamp_obj.location = (%f,%f,%f)\n"
"bpy.context.scene.objects.link(lamp_obj)\n"
"\n", s, light.q / 8.0,
"\n", s, light.lightType, light.q / 8.0,
light.color.vec[0], light.color.vec[1], light.color.vec[2],
light.position.vec[0], light.position.vec[1], light.position.vec[2]);

1
DataSpec/DNAMP1/MREA.cpp
View File

@ -68,6 +68,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
" bpy.context.scene.objects.unlink(ob)\n"
" bpy.data.objects.remove(ob)\n"
"bpy.types.Lamp.retro_layer = bpy.props.IntProperty(name='Retro: Light Layer')\n"
"bpy.types.Lamp.retro_origtype = bpy.props.IntProperty(name='Retro: Original Type')\n"
"bpy.types.Object.retro_disable_enviro_visor = bpy.props.BoolProperty(name='Retro: Disable in Combat/Scan Visor')\n"
"bpy.types.Object.retro_disable_thermal_visor = bpy.props.BoolProperty(name='Retro: Disable in Thermal Visor')\n"
"bpy.types.Object.retro_disable_xray_visor = bpy.props.BoolProperty(name='Retro: Disable in X-Ray Visor')\n"

4
DataSpec/DNAMP1/MREA.hpp
View File

@ -77,7 +77,9 @@ struct MREA
LightLocalAmbient,
LightDirectional,
LightCustom,
LightSpot
LightSpot,
LightSpot2,
LightLocalAmbient2
};
enum Falloff : atUint32
{

1
DataSpec/DNAMP2/MREA.cpp
View File

@ -205,6 +205,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
" bpy.context.scene.objects.unlink(ob)\n"
" bpy.data.objects.remove(ob)\n"
"bpy.types.Lamp.retro_layer = bpy.props.IntProperty(name='Retro: Light Layer')\n"
"bpy.types.Lamp.retro_origtype = bpy.props.IntProperty(name='Retro: Original Type')\n"
"bpy.types.Object.retro_disable_enviro_visor = bpy.props.BoolProperty(name='Retro: Disable in Combat/Scan Visor')\n"
"bpy.types.Object.retro_disable_thermal_visor = bpy.props.BoolProperty(name='Retro: Disable in Thermal Visor')\n"
"bpy.types.Object.retro_disable_xray_visor = bpy.props.BoolProperty(name='Retro: Disable in X-Ray Visor')\n"

5
DataSpec/DNAMP3/ANIM.cpp
View File

@ -374,7 +374,10 @@ static float ComputeFrames(const std::vector<float>& keyTimes, std::vector<atUin
lastTime = *it;
}
mainInterval = 1.0 / round(1.0 / mainInterval);
float fps = round(1.0 / mainInterval);
if (fps < 15.0)
fps = 15.0;
mainInterval = 1.0 / fps;
framesOut.clear();
framesOut.reserve(keyTimes.size());

1
DataSpec/DNAMP3/MREA.cpp
View File

@ -118,6 +118,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
" bpy.context.scene.objects.unlink(ob)\n"
" bpy.data.objects.remove(ob)\n"
"bpy.types.Lamp.retro_layer = bpy.props.IntProperty(name='Retro: Light Layer')\n"
"bpy.types.Lamp.retro_origtype = bpy.props.IntProperty(name='Retro: Original Type')\n"
"\n";
/* One shared material set for all meshes */

4
DataSpec/DNAMP3/MREA.hpp
View File

@ -85,7 +85,9 @@ struct MREA
LightLocalAmbient,
LightDirectional,
LightCustom,
LightSpot
LightSpot,
LightSpot2,
LightLocalAmbient2
};
enum Falloff : atUint32
{