AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows fixes

This commit is contained in:
Jack Andersen 2017-01-20 14:20:19 -10:00
parent b958182073
commit 04452ad919
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DataSpec/DNACommon/MAPA.cpp
View File

@ -282,6 +282,7 @@ bool ReadMAPAToBlender(hecl::BlenderConnection& conn,
os << "mesh = bpy.data.meshes.new('MAP')\n" os << "mesh = bpy.data.meshes.new('MAP')\n"
"mesh.show_edge_seams = True\n"
"obj = bpy.data.objects.new(mesh.name, mesh)\n" "obj = bpy.data.objects.new(mesh.name, mesh)\n"
"bm.to_mesh(mesh)\n" "bm.to_mesh(mesh)\n"
"bpy.context.scene.objects.link(obj)\n" "bpy.context.scene.objects.link(obj)\n"

28
DataSpec/DNAMP1/FRME.cpp
View File

@ -470,13 +470,24 @@ bool FRME::Extract(const SpecBase &dataSpec,
} }
resPath = pakRouter.getResourceRelativePath(entry, info->texture); resPath = pakRouter.getResourceRelativePath(entry, info->texture);
} }
hecl::SystemUTF8View resPathView(resPath);
os.format("if '%s' in bpy.data.images:\n" if (resPath.size())
" image = bpy.data.images['%s']\n" {
"else:\n" hecl::SystemUTF8View resPathView(resPath);
" image = bpy.data.images.load('''//%s''')\n" os.format("if '%s' in bpy.data.images:\n"
" image.name = '%s'\n" " image = bpy.data.images['%s']\n"
"material = bpy.data.materials.new('%s')\n" "else:\n"
" image = bpy.data.images.load('''//%s''')\n"
" image.name = '%s'\n",
texName.c_str(), texName.c_str(),
resPathView.str().c_str(), texName.c_str());
}
else
{
os << "image = None\n";
}
os.format("material = bpy.data.materials.new('%s')\n"
"material.specular_intensity = 0.0\n" "material.specular_intensity = 0.0\n"
"tex_slot = material.texture_slots.add()\n" "tex_slot = material.texture_slots.add()\n"
"tex_slot.texture = bpy.data.textures.new('%s', 'IMAGE')\n" "tex_slot.texture = bpy.data.textures.new('%s', 'IMAGE')\n"
@ -484,9 +495,8 @@ bool FRME::Extract(const SpecBase &dataSpec,
"material.active_texture = tex_slot.texture\n" "material.active_texture = tex_slot.texture\n"
"bm = bmesh.new()\n" "bm = bmesh.new()\n"
"verts = []\n", "verts = []\n",
texName.c_str(), texName.c_str(),
resPathView.str().c_str(), texName.c_str(),
w.header.name.c_str(), w.header.name.c_str()); w.header.name.c_str(), w.header.name.c_str());
for (int i=0 ; i<info->quadCoordCount ; ++i) for (int i=0 ; i<info->quadCoordCount ; ++i)
{ {
int ti; int ti;

2
Runtime/Audio/CStreamAudioManager.cpp
View File

@ -921,7 +921,7 @@ struct SDSPPlayer
{ {
std::string x0_fileName; std::string x0_fileName;
EPlayerState x10_playState = EPlayerState::Stopped; EPlayerState x10_playState = EPlayerState::Stopped;
float x14_volume = 0.0; float x14_volume = 0.f;
float x18_fadeIn = 0.f; float x18_fadeIn = 0.f;
float x1c_fadeOut = 0.f; float x1c_fadeOut = 0.f;
u32 x20_internalHandle = -1; u32 x20_internalHandle = -1;

2
Runtime/MP1/MP1.cpp
View File

@ -232,7 +232,7 @@ void CMain::Init(const hecl::Runtime::FileStoreManager& storeMgr,
x164_archSupport->PreloadAudio(); x164_archSupport->PreloadAudio();
//g_TweakManager->ReadFromMemoryCard("AudioTweaks"); //g_TweakManager->ReadFromMemoryCard("AudioTweaks");
CStreamAudioManager::Start(false, "Audio/rui_samusL.dsp|Audio/rui_samusR.dsp", 0x7f, true, 1.f, 1.f); //CStreamAudioManager::Start(false, "Audio/rui_samusL.dsp|Audio/rui_samusR.dsp", 0x7f, true, 1.f, 1.f);
} }
bool CMain::Proc() bool CMain::Proc()

2
hecl

@ -1 +1 @@
Subproject commit 3ecbf32de81e1b3c76ad9519ca728a8fc2debe0b Subproject commit 92be7073997f5a4ea4a040b893a11eed3dca5b70

2
nod

@ -1 +1 @@
Subproject commit bb6a5ff4446536bfda10dab4506988d8227363f3 Subproject commit b3a76428da3bfb83bd973f985b0760a6b55c2abe