sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Deletes "obsolete and rubbish" textureconv

Browse Source 
This was SVN commit r13330.
This commit is contained in:
historic_bruno 2013-03-31 23:53:53 +00:00
parent 3b5ab7ab51
commit afde8b04fd
7 changed files with 0 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/tools/LICENSE.txt
View File

@ -72,8 +72,5 @@ in particular, let us know and we can try to clarify it.
templatessorter
MIT
textureconv
MIT
webservices
MIT / unspecified

56
source/tools/textureconv/crashlog.cpp
View File

@ -1,56 +0,0 @@
#if 0
#pragma comment(lib, "dbghelp.lib")
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <dbghelp.h>
#include <stdlib.h>
#define FILENAME "c:\\texconv_crashlog.dmp"
void DumpMiniDump(HANDLE hFile, PEXCEPTION_POINTERS excpInfo)
{
MINIDUMP_EXCEPTION_INFORMATION eInfo;
eInfo.ThreadId = GetCurrentThreadId();
eInfo.ExceptionPointers = excpInfo;
eInfo.ClientPointers = FALSE;
if (!MiniDumpWriteDump(
GetCurrentProcess(),
GetCurrentProcessId(),
hFile,
MiniDumpNormal,
excpInfo ? &eInfo : NULL,
NULL,
NULL))
{
}
}
LONG WINAPI exception_filter(PEXCEPTION_POINTERS ep)
{
MessageBox(NULL, "Fatal error - generating " FILENAME "...", "Fatal error", MB_OK | MB_ICONERROR);
HANDLE hFile = CreateFile(FILENAME, GENERIC_WRITE, FILE_SHARE_WRITE, 0, CREATE_ALWAYS, 0, 0);
if (hFile == INVALID_HANDLE_VALUE)
{
MessageBox(NULL, "Failed to generate crash log :-(", "Fatal error", MB_OK | MB_ICONEXCLAMATION);
}
else
{
DumpMiniDump(hFile, ep);
CloseHandle(hFile);
}
exit(EXIT_FAILURE);
}
struct onInit
{
onInit()
{
SetUnhandledExceptionFilter(exception_filter);
}
} onInit;
#endif

42
source/tools/textureconv/launch/launch.c
View File

@ -1,42 +0,0 @@
#include <windows.h>
const char* ExeName = "textureconv.exe";
const char* ExtraParams = "REPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEME";
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR pCmdLine, int nCmdShow)
{
static char Path[MAX_PATH];
static char Prog[MAX_PATH];
char *Srch;
LPSTR NewCmdLine;
if (pCmdLine)
{
NewCmdLine = malloc(strlen(pCmdLine) + strlen(ExtraParams) + 2);
if (!NewCmdLine)
return 3;
strcpy(NewCmdLine, ExtraParams);
strcat(NewCmdLine, " ");
strcat(NewCmdLine, pCmdLine);
}
else
{
NewCmdLine = (char*)ExtraParams;
}
if (!GetModuleFileName(hInstance, Path, sizeof(Path)))
return 1;
Srch = strrchr(Path, '\\');
if (!Srch)
return 2;
Srch[0] = '\0';
strcpy(Prog, Path);
strcat(Prog, "\\");
strcat(Prog, ExeName);
ShellExecute(NULL, "open", Prog, NewCmdLine, Path, SW_SHOWNORMAL);
return 0;
}

33
source/tools/textureconv/launch/makeexe.pl
View File

@ -1,33 +0,0 @@
# Used to make variations of the launcher exe, which is necessary because drag-and-drop
# onto .bat files appears to not run in the right directory (and so there's no way of it
# finding the actual textureconv.exe)
#
# It just compiles launch.c, then replaces the REPLACEME string with other strings
use strict;
use warnings;
my %settings = (
TexConv_Normal => "",
TexConv_WithAlpha => "-alphablock",
TexConv_WithoutAlpha => "-noalphablock",
TexConv_ToTGA => "-tga",
);
system("cl /Od launch.c shell32.lib");
die $? if $?;
open A, 'launch.exe' or die $!;
binmode A;
my $d = do { local $/; <A> };
my $str = "REPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEMEREPLACEME";
for my $k (keys %settings) {
die if length $settings{$k} > length $str;
my $d2 = $d;
$d2 =~ s/$str/ $settings{$k} . ("\0" x (length($str) - length($settings{$k}))) /e or die;
open O, '>', "$k.exe" or die $!;
binmode O;
print O $d2;
}

364
source/tools/textureconv/main.cpp
View File

@ -1,364 +0,0 @@
#include "IL/il.h"
#include "IL/ilu.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <assert.h>
#include <string>
#include <vector>
#include <stack>
#include <tchar.h>
#include <time.h>
#ifndef NDEBUG
#include <crtdbg.h>
#endif
#ifdef UNICODE
#define tstring wstring
#define tstrcmp wcscmp
#define tstrrchr wcsrchr
#define tsprintf swprintf
#define tmain wmain
#else
#define tstring string
#define tstrcmp strcmp
#define tstrrchr strrchr
#define tsprintf sprintf
#define tmain main
#endif
const TCHAR* msgbox_title = _T("Wildfire Games - Texture Converter");
enum OutputFileFormat { DXTn, DXT1, DXT3, DXT5, ABGR, BMP, TGA, BEST };
enum trool { tr_false, tr_true, tr_maybe };
struct ConversionSettings
{
OutputFileFormat fmt;
bool mipmaps;
trool alphablock;
};
void process_args(int argc, TCHAR** argv);
void convert(std::tstring filename, ConversionSettings& settings);
void msg(const TCHAR* message, int icon)
{
MessageBox(NULL, message, msgbox_title, MB_OK | icon);
}
void die(const TCHAR* message)
{
msg(message, MB_ICONERROR);
exit(1);
}
int tmain(int argc, TCHAR** argv)
{
#ifndef NDEBUG
_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF);
//_CrtSetBreakAlloc(108);
#endif
if (argc <= 1)
{
msg(_T("To run the texture converter, drag-and-drop BMP files onto the Texture Converter's icon."), MB_ICONINFORMATION);
exit(0);
}
ilInit();
clock_t t=clock();
process_args(argc-1, argv+1);
t=clock()-t;
TCHAR buf[256];
tsprintf(buf, _T("Conversion complete (%.2f seconds)"), (double)t/CLOCKS_PER_SEC);
msg(buf, MB_ICONINFORMATION);
return 0;
}
void check()
{
ILenum err = ilGetError();
if (err != IL_NO_ERROR)
{
TCHAR buf[256];
tsprintf(buf, _T("DevIL error '%04x' encountered"), err);
die(buf);
}
}
void process_args(int argc, TCHAR** argv)
{
// Process arguments: Things like "-dxt5" alter the current output format
// and settings. Brackets allow scoped changes. Anything else is a filename
// to be converted.
//
// Example: "textureconv.exe a.bmp ( -dxt1 b.bmp -dxt3 c.bmp ) d.bmp"
// will use default settings for a.bmp and d.bmp, DXT1 for b.bmp, and
// DXT3 for c.bmp.
std::stack<ConversionSettings> settings;
ConversionSettings def = { BEST, false, tr_false };
settings.push(def);
for (int i = 0; i < argc; ++i)
{
#define CASE(s) else if (tstrcmp(argv[i], _T(s)) == 0)
if(0);
CASE("(")
settings.push(settings.top());
CASE(")")
{
if (settings.size() <= 1)
die(_T("Incorrect command-line parenthesis nesting"));
settings.pop();
}
CASE("-dxt1")
settings.top().fmt = DXT1;
CASE("-dxt3")
settings.top().fmt = DXT3;
CASE("-dxt5")
settings.top().fmt = DXT5;
CASE("-abgr")
settings.top().fmt = ABGR;
CASE("-bmp")
settings.top().fmt = BMP;
CASE("-tga")
settings.top().fmt = TGA;
CASE("-mipmaps")
settings.top().mipmaps = true;
CASE("-nomipmaps")
settings.top().mipmaps = false;
CASE("-alphablock")
settings.top().alphablock = tr_true;
CASE("-noalphablock")
settings.top().alphablock = tr_false;
else
{
ConversionSettings s = settings.top(); // copy
if (s.fmt == BEST)
{
// Convert .dds->BMP, and anything else to DDS
const TCHAR* dot = tstrrchr(argv[i], _T('.'));
if (dot && tstrcmp(dot, _T(".dds"))==0)
s.fmt = BMP;
else
s.fmt = DXTn;
}
convert(argv[i], s);
}
#undef CASE
}
}
void convert(std::tstring filename, ConversionSettings& settings)
{
// Generate the output .dds/etc filename:
size_t dot = filename.rfind(_T("."));
if (dot == filename.npos)
{
std::tstring msg = _T("Attempted conversion of invalid filename '") + filename + _T("' - aborting.");
die(msg.c_str());
}
//OutputDebugString(filename.c_str());
//OutputDebugString(L"\n");
const TCHAR* extn;
switch (settings.fmt)
{
case DXTn:
case DXT1:
case DXT3:
case DXT5:
case ABGR:
extn = _T(".dds");
break;
case BMP:
extn = _T(".bmp");
break;
case TGA:
extn = _T(".tga");
break;
default:
die(_T("Internal error - invalid output format"));
}
std::tstring filename_out = filename.substr(0, dot) + extn;
// Load the original image:
ILuint img;
ilGenImages(1, &img);
ilBindImage(img);
check();
ilOriginFunc(IL_ORIGIN_UPPER_LEFT);
ilEnable(IL_ORIGIN_SET);
check();
if (! ilLoadImage((TCHAR*) filename.c_str()))
{
std::tstring msg = _T("Error loading file '") + filename + _T("' - aborting.");
die(msg.c_str());
}
// Make sure it's in a nice format for future processing
ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE);
check();
ILinfo info;
iluGetImageInfo(&info);
check();
// Check for the existence of a non-solid alpha channel (so that it won't
// be stored when it has no useful data)
bool has_alpha = false;
{
if (info.Type != IL_UNSIGNED_BYTE || info.Format != IL_RGBA)
die(_T("Internal error - invalid data format"));
ILubyte* pos = ilGetData();
ILubyte* end = pos + info.Height*info.Width*info.Bpp;
for (pos += 3; pos < end; pos += info.Bpp)
{
if (*pos != 0xff)
{
has_alpha = true;
break;
}
}
}
if (settings.fmt == DXTn || settings.fmt == DXT1 || settings.fmt == DXT3 || settings.fmt == DXT5)
{
if (settings.alphablock == tr_true || (settings.alphablock == tr_maybe && info.Height == info.Width*2))
{
// Reading from file with special alpha mode: colour stored in top
// half, alpha in bottom half (as greyscale)
// Start/end of top half
ILubyte* start = ilGetData();
ILubyte* end = start + ((info.Width*info.Height)/2) * info.Bpp;
// Get the start/end of the colour and alpha (as greyscale) sections
ILubyte* buf_c = start + 3; // 4th byte of RGBA
ILubyte* buf_a = end;
ILubyte* end_a = end + (end-start);
// Copy greyscale's R component into colour's A
for (; buf_a < end_a; buf_c+=4, buf_a+=4)
*buf_c = *buf_a;
// Chop off the bottom of the image
iluCrop(0, 0, 0, info.Width, info.Height/2, 1);
has_alpha = true;
}
}
else if (settings.fmt == BMP)
{
if (has_alpha)
{
// Writing to file with special alpha mode: colour stored in top
// half, alpha in bottom half (as greyscale)
// Add some space for the new image
iluImageParameter(ILU_PLACEMENT, ILU_UPPER_LEFT);
iluEnlargeCanvas(info.Width, info.Height*2, 1);
// Start/end of top half
ILubyte* start = ilGetData();
ILubyte* end = start + (info.Width*info.Height) * info.Bpp;
// Get the start/end of the colour and alpha (as greyscale) sections
ILubyte* buf_c = start + 3;
ILubyte* buf_a = end;
ILubyte* end_a = end + (end-start);
// Copy colour's A component into greyscale's RGB
for (; buf_a < end_a; buf_c+=4, buf_a+=4)
{
*buf_a = *(buf_a+1) = *(buf_a+2) = *buf_c;
*buf_c = *(buf_a+3) = 0xff; // clear the alpha channel
}
}
}
switch (settings.fmt)
{
case DXTn:
if (has_alpha)
ilSetInteger(IL_DXTC_FORMAT, IL_DXT5);
else
ilSetInteger(IL_DXTC_FORMAT, IL_DXT1);
break;
case DXT1:
ilSetInteger(IL_DXTC_FORMAT, IL_DXT1);
break;
case DXT3:
ilSetInteger(IL_DXTC_FORMAT, IL_DXT3);
break;
case DXT5:
ilSetInteger(IL_DXTC_FORMAT, IL_DXT5);
break;
case ABGR:
ilSetInteger(IL_DXTC_FORMAT, IL_DXT_NO_COMP);
break;
}
if (settings.mipmaps)
{
iluBuildMipmaps();
/*
// TODO: replace with proper sharp mipmap code
int num = ilGetInteger(IL_NUM_MIPMAPS);
for (int n = 1; n < num; ++n)
{
ilActiveMipmap(n);
iluSharpen(3.0, 1);
ilActiveMipmap(0);
}
*/
check();
}
ilEnable(IL_FILE_OVERWRITE);
check();
if (! ilSaveImage((TCHAR*) filename_out.c_str()))
{
std::tstring msg = _T("Error saving file '") + filename_out + _T("' - aborting.");
die(msg.c_str());
}
check();
}

39
source/tools/textureconv/textureconv.sln
View File

@ -1,39 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "textureconv", "textureconv.vcproj", "{FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}"
ProjectSection(ProjectDependencies) = postProject
{76BBC723-9716-451F-92D9-A7B65F3BA85F} = {76BBC723-9716-451F-92D9-A7B65F3BA85F}
{984C31F1-11EB-4D44-ACF4-B3F573E1F08E} = {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL", "..\..\..\libraries\devil\src\src-IL\msvc\il.vcproj", "{76BBC723-9716-451F-92D9-A7B65F3BA85F}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILU", "..\..\..\libraries\devil\src\src-ILU\msvc\ILU.vcproj", "{984C31F1-11EB-4D44-ACF4-B3F573E1F08E}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}.Debug.ActiveCfg = Debug|Win32
{FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}.Debug.Build.0 = Debug|Win32
{FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}.Release.ActiveCfg = Release|Win32
{FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}.Release.Build.0 = Release|Win32
{76BBC723-9716-451F-92D9-A7B65F3BA85F}.Debug.ActiveCfg = Debug Unicode|Win32
{76BBC723-9716-451F-92D9-A7B65F3BA85F}.Debug.Build.0 = Debug Unicode|Win32
{76BBC723-9716-451F-92D9-A7B65F3BA85F}.Release.ActiveCfg = Release Unicode|Win32
{76BBC723-9716-451F-92D9-A7B65F3BA85F}.Release.Build.0 = Release Unicode|Win32
{984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Debug.ActiveCfg = Debug Unicode|Win32
{984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Debug.Build.0 = Debug Unicode|Win32
{984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Release.ActiveCfg = Release Unicode|Win32
{984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Release.Build.0 = Release Unicode|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

145
source/tools/textureconv/textureconv.vcproj
View File

@ -1,145 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="textureconv"
ProjectGUID="{FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}"
RootNamespace="textureconv"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\libraries\devil\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="DevIL_DBG.lib DevILU_DBG.lib"
OutputFile="$(OutDir)/textureconv.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;..\..\..\libraries\devil\lib&quot;"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/textureconv.pdb"
SubSystem="0"
EntryPointSymbol=""
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="FALSE">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\libraries\devil\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="DevIL.lib DevILU.lib"
OutputFile="$(OutDir)/textureconv.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\libraries\devil\lib&quot;"
GenerateDebugInformation="TRUE"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\crashlog.cpp">
</File>
<File
RelativePath=".\main.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>