OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 03:39:08 +00:00
Code Releases Activity

Progress towards making plClient compile

Browse Source
This commit is contained in:
Michael Hansen
2011-04-09 17:32:18 -07:00
parent 7069e00e6f
commit f7a9adab72
28 changed files with 383 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt
View File

@ -14,7 +14,7 @@ add_subdirectory(plEncryption)
add_subdirectory(plFile)
#add_subdirectory(plGClip) # Not being used by any current slns
#add_subdirectory(plGeometry) # Not being used by any current slns
#add_subdirectory(plGImage)
add_subdirectory(plGImage)
add_subdirectory(plGLight)
#add_subdirectory(plGRenderProcs) # Not being used by any current slns
add_subdirectory(plInputCore)

47
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt Normal file
View File

@ -0,0 +1,47 @@
include_directories("../../CoreLib")
include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
set(plGImage_SOURCES
hsCodecManager.cpp
hsDXTDirectXCodec.cpp
hsDXTSoftwareCodec.cpp
plAVIWriter.cpp
plBitmap.cpp
plBumpMapGen.cpp
plCubicEnvironmap.cpp
plDynamicTextMap.cpp
plDynSurfaceWriter.cpp
plFont.cpp
plFontCache.cpp
plLODMipmap.cpp
plMipmap.cpp
plTGAWriter.cpp
plWinFontCache.cpp
)
set(plGImage_HEADERS
hsCodecManager.h
hsDXTDirectXCodec.h
hsDXTSoftwareCodec.h
hsRect.h
plAVIWriter.h
plBitmap.h
plBumpMapGen.h
plCubicEnvironmap.h
plDynamicTextMap.h
plDynSurfaceWriter.h
plFont.h
plFontCache.h
plGImageCreatable.h
plLODMipmap.h
plMipmap.h
plTGAWriter.h
plWinFontCache.h
)
add_library(plGImage STATIC ${plGImage_SOURCES} ${plGImage_HEADERS})
source_group("Source Files" FILES ${plGImage_SOURCES})
source_group("Header Files" FILES ${plGImage_HEADERS})

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/hsDXTDirectXCodec.cpp
View File

@ -39,13 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsWindows.h"
#include <ddraw.h>
#include <d3d.h>
#include <d3d9.h>
#include "hsTypes.h"
#include "hsDXTDirectXCodec.h"
#include "plMipmap.h"
#include "hsCodecManager.h"
#include "../plPipeline/hsGDDrawDllLoad.h"
#include "plPipeline/hsGDDrawDllLoad.h"
namespace {
typedef HRESULT(WINAPI * DIRECTDRAWCREATEEX)( GUID*, VOID**, REFIID, IUnknown* );

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp
View File

@ -32,10 +32,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTimer.h"
#include "plMipmap.h"
#include "../plMessage/plRenderMsg.h"
#include "plMessage/plRenderMsg.h"
#include "plPipeline.h"
#include "../pnDispatch/plDispatch.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "pnDispatch/plDispatch.h"
#include "pnKeyedObject/plFixedKey.h"
bool plAVIWriter::fInitialized = false;

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.h
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plAVIWriter_h_inc
#define plAVIWriter_h_inc
#include "../pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/hsKeyedObject.h"
class plPipeline;

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp
View File

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsResMgr.h"
#include "hsStream.h"
#include "../pnKeyedObject/plKey.h"
#include "../plPipeline/hsGDeviceRef.h"
#include "pnKeyedObject/plKey.h"
#include "plPipeline/hsGDeviceRef.h"
//// Static Members ///////////////////////////////////////////////////////////

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp
View File

@ -46,10 +46,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsExceptions.h"
#include "hsUtils.h"
#include "hsMatrix44.h"
#include "../plMessage/plDynamicTextMsg.h"
#include "../pnKeyedObject/plKey.h"
#include "plMessage/plDynamicTextMsg.h"
#include "pnKeyedObject/plKey.h"
#include "plProfile.h"
#include "../plStatusLog/plStatusLog.h"
#include "plStatusLog/plStatusLog.h"
#include "plWinFontCache.h"

10
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp
View File

@ -42,14 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsExceptions.h"
#include "hsUtils.h"
#include "hsMatrix44.h"
#include "../plPipeline/hsGDeviceRef.h"
#include "../plMessage/plDynamicTextMsg.h"
#include "../pnKeyedObject/plKey.h"
#include "plPipeline/hsGDeviceRef.h"
#include "plMessage/plDynamicTextMsg.h"
#include "pnKeyedObject/plKey.h"
#include "plProfile.h"
#include "../plStatusLog/plStatusLog.h"
#include "plStatusLog/plStatusLog.h"
#include "plFont.h"
#include "plFontCache.h"
#include "../plResMgr/plLocalization.h"
#include "plResMgr/plLocalization.h"
plProfile_CreateMemCounter("DynaTextMem", "PipeC", DynaTextMem);

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFont.h
View File

@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h"
#include "pcSmallRect.h"
#include "../pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/hsKeyedObject.h"
#include <wchar.h>

8
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFontCache.cpp
View File

@ -40,12 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plFontCache.h"
#include "plFont.h"
#include "../plStatusLog/plStatusLog.h"
#include "../plFile/hsFiles.h"
#include "../pnMessage/plRefMsg.h"
#include "plStatusLog/plStatusLog.h"
#include "plFile/hsFiles.h"
#include "pnMessage/plRefMsg.h"
#include "hsResMgr.h"
#include "../pnKeyedObject/plUoid.h"
#include "pnKeyedObject/plUoid.h"
char *plFontCache::kCustFontExtension = ".prf";

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFontCache.h
View File

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "hsTemplates.h"
#include "../pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/hsKeyedObject.h"
//// Class Definition /////////////////////////////////////////////////////////

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plGImageCreatable.h
View File

@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plGImageCreatable_inc
#define plGImageCreatable_inc
#include "../pnFactory/plCreator.h"
#include "pnFactory/plCreator.h"
/*
#include "hsGMipmap.h"

8
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp
View File

@ -28,11 +28,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plLODMipmap.h"
#include "hsResMgr.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plUoid.h"
#include "../pnMessage/plRefMsg.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plUoid.h"
#include "pnMessage/plRefMsg.h"
#include "../plPipeline/hsGDeviceRef.h"
#include "plPipeline/hsGDeviceRef.h"
plLODMipmap::plLODMipmap()

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
View File

@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsExceptions.h"
#include "hsUtils.h"
#include "hsColorRGBA.h"
#include "../plPipeline/hsGDeviceRef.h"
#include "plPipeline/hsGDeviceRef.h"
#include "plProfile.h"
#include "../plJPEG/plJPEG.h"
#include "plJPEG/plJPEG.h"
plProfile_CreateMemCounter("Mipmaps", "Memory", MemMipmaps);

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp
View File

@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsWindows.h"
#include "plWinFontCache.h"
#include "../plStatusLog/plStatusLog.h"
#include "../plFile/hsFiles.h"
#include "../plGImage/plDynSurfaceWriter.h"
#include "plStatusLog/plStatusLog.h"
#include "plFile/hsFiles.h"
#include "plGImage/plDynSurfaceWriter.h"
#if HS_BUILD_FOR_WIN32

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp
View File

@ -200,7 +200,7 @@ const plUnifiedTime & plUnifiedTime::operator=(const plUnifiedTime * src)
const plUnifiedTime & plUnifiedTime::operator=(time_t src)
{
fSecs = src;
fSecs = (UInt32)src;
fMicros = 0;
return *this;
}
@ -222,7 +222,7 @@ const plUnifiedTime & plUnifiedTime::operator=(const struct timeval & src)
const plUnifiedTime & plUnifiedTime::operator=(const struct tm & src)
{
struct tm atm = src;
fSecs = mktime(&atm); // this won't work after 2030 something, sorry
fSecs = (UInt32)mktime(&atm); // this won't work after 2030 something, sorry
return *this;
}
@ -268,7 +268,7 @@ hsBool plUnifiedTime::SetTime(short year, short month, short day, short hour, sh
atm.tm_mon = month - 1;
atm.tm_year = year - 1900;
atm.tm_isdst = dst;
fSecs = mktime(&atm); // this won't work after 2030 something, sorry
fSecs = (UInt32)mktime(&atm); // this won't work after 2030 something, sorry
if (fSecs == -1)
return false;
if (fMicros >= 1000000)