Changed: #1440 Cleanup interface build configuration

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 12 years ago
parent c807a1eab5
commit 32d53ce3e3

@ -53,7 +53,7 @@ CProcessInterface::~CProcessInterface()
void CProcessInterface::buildAtlas(const std::string &dependLog, const std::string &errorLog, const std::vector<std::string> &srcDirectories, const std::string &dstFile) void CProcessInterface::buildAtlas(const std::string &dependLog, const std::string &errorLog, const std::vector<std::string> &srcDirectories, const std::string &dstFile)
{ {
nldebug("Build atlas '%s'", dstFile.c_str()); nldebug("Build: Atlas '%s'", dstFile.c_str());
std::vector<std::string> arguments; std::vector<std::string> arguments;
arguments.push_back(std::string("-d") + dependLog); arguments.push_back(std::string("-d") + dependLog);
arguments.push_back(std::string("-e") + errorLog); arguments.push_back(std::string("-e") + errorLog);
@ -65,7 +65,7 @@ void CProcessInterface::buildAtlas(const std::string &dependLog, const std::stri
void CProcessInterface::build() void CProcessInterface::build()
{ {
nldebug("Building process interface!"); nldebug("Build process plugin: CProcessInterface");
std::string tempDir = m_PipelineProcess->getTempDirectory(); std::string tempDir = m_PipelineProcess->getTempDirectory();
std::string dependLog = tempDir + "depend.log"; std::string dependLog = tempDir + "depend.log";

@ -1,7 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<DFN Revision="$Revision$" State="modified"> <DFN Revision="$Revision$" State="modified">
<ELEMENT Name="Atlas" Type="Dfn" Filename="pipeline_common_id_of.dfn" Array="true"/> <ELEMENT Name="Atlas" Type="Dfn" Filename="pipeline_common_id_of.dfn" Array="true"/>
<ELEMENT Name="AtlasDxtc" Type="Dfn" Filename="pipeline_common_id_of.dfn" Array="true"/>
<ELEMENT Name="Fullscreen" Type="Dfn" Filename="pipeline_common_id_od.dfn" Array="false"/> <ELEMENT Name="Fullscreen" Type="Dfn" Filename="pipeline_common_id_od.dfn" Array="false"/>
<ELEMENT Name="3D" Type="Dfn" Filename="pipeline_common_id_od.dfn" Array="false"/> <ELEMENT Name="3D" Type="Dfn" Filename="pipeline_common_id_od.dfn" Array="false"/>
<LOG></LOG> <LOG></LOG>

@ -7,10 +7,6 @@
<ATOM Name="Name" Value="DstInterfaceAtlas"/> <ATOM Name="Name" Value="DstInterfaceAtlas"/>
<ATOM Name="Value" Value="[!OutputDirectory]/interface_atlas/"/> <ATOM Name="Value" Value="[!OutputDirectory]/interface_atlas/"/>
</STRUCT> </STRUCT>
<STRUCT>
<ATOM Name="Name" Value="DstInterfaceAtlasDxtc"/>
<ATOM Name="Value" Value="[!OutputDirectory]/interface_atlas_dxtc/"/>
</STRUCT>
</ARRAY> </ARRAY>
<ARRAY Name="Processes"> <ARRAY Name="Processes">
<ATOM Value="Interface"/> <ATOM Value="Interface"/>
@ -36,15 +32,13 @@
</ARRAY> </ARRAY>
<ATOM Name="DstFile" Value="[&amp;DstInterfaceAtlas]/texture_interfaces_v3_outgame_ui.tga"/> <ATOM Name="DstFile" Value="[&amp;DstInterfaceAtlas]/texture_interfaces_v3_outgame_ui.tga"/>
</STRUCT> </STRUCT>
</ARRAY>
<ARRAY Name="AtlasDxtc">
<STRUCT> <STRUCT>
<ARRAY Name="SrcDirectories"> <ARRAY Name="SrcDirectories">
<ATOM Value="[$DatabaseDirectory]/interfaces/v3_bricks"/> <ATOM Value="[$DatabaseDirectory]/interfaces/v3_bricks"/>
<ATOM Value="[$DatabaseDirectory]/interfaces/v3_items"/> <ATOM Value="[$DatabaseDirectory]/interfaces/v3_items"/>
<ATOM Value="[$DatabaseDirectory]/interfaces/v3_dxtc_misc"/> <ATOM Value="[$DatabaseDirectory]/interfaces/v3_dxtc_misc"/>
</ARRAY> </ARRAY>
<ATOM Name="DstFile" Value="[&amp;DstInterfaceAtlasDxtc]/texture_interfaces_dxtc.tga"/> <ATOM Name="DstFile" Value="[&amp;DstInterfaceAtlas]/texture_interfaces_dxtc.tga"/>
</STRUCT> </STRUCT>
</ARRAY> </ARRAY>
<STRUCT Name="Fullscreen"> <STRUCT Name="Fullscreen">

Loading…
Cancel
Save