Additional data updates

DataSpec/DNACommon/BabeDead.hpp

@@ -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]);
 

DataSpec/DNAMP1/MREA.cpp

@@ -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"

DataSpec/DNAMP1/MREA.hpp

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

DataSpec/DNAMP2/MREA.cpp

@@ -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"

DataSpec/DNAMP3/ANIM.cpp

@@ -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());

DataSpec/DNAMP3/MREA.cpp

@@ -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 */

DataSpec/DNAMP3/MREA.hpp

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