From 2f01969781df9c57612780aa971eaf506718bc48 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Feb 2011 01:59:47 -0600 Subject: [PATCH 1/5] smpackage blargh stuff --- src/smpackage-net2003.vcproj | 821 +++++++---- src/smpackage/ZipArchive/StdAfx.h | 12 +- .../ZipArchive/ZipArchive-net2003.vcproj | 1229 +++++++++++------ src/smpackage/ZipArchive/__Windows_MFC.zcfg | 1 + 4 files changed, 1358 insertions(+), 705 deletions(-) diff --git a/src/smpackage-net2003.vcproj b/src/smpackage-net2003.vcproj index 20e5db17a1..8bbe33e746 100644 --- a/src/smpackage-net2003.vcproj +++ b/src/smpackage-net2003.vcproj @@ -1,25 +1,51 @@ + Keyword="MFCProj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - - - + Name="VCPostBuildEventTool" + /> @@ -151,661 +212,861 @@ + > + RelativePath=".\smpackage\ChangeGameSettings.cpp" + > + RelativePath=".\smpackage\ChangeGameSettings.h" + > + RelativePath=".\smpackage\CreateLanguageDlg.cpp" + > + RelativePath=".\smpackage\CreateLanguageDlg.h" + > + RelativePath=".\smpackage\EditInsallations.cpp" + > + RelativePath=".\smpackage\EditInsallations.h" + > + RelativePath=".\smpackage\EnterComment.cpp" + > + RelativePath=".\smpackage\EnterComment.h" + > + RelativePath=".\smpackage\EnterName.cpp" + > + RelativePath=".\smpackage\EnterName.h" + > + RelativePath=".\smpackage\LanguagesDlg.cpp" + > + RelativePath=".\smpackage\LanguagesDlg.h" + > + RelativePath=".\smpackage\MainMenuDlg.cpp" + > + RelativePath=".\smpackage\MainMenuDlg.h" + > + RelativePath=".\smpackage\ShowComment.cpp" + > + RelativePath=".\smpackage\ShowComment.h" + > + RelativePath=".\smpackage\smpackage.cpp" + > + RelativePath=".\smpackage\smpackage.h" + > + RelativePath=".\smpackage\SmpackageExportDlg.cpp" + > + RelativePath=".\smpackage\SmpackageExportDlg.h" + > + RelativePath=".\smpackage\SMPackageInstallDlg.cpp" + > + RelativePath=".\smpackage\SMPackageInstallDlg.h" + > + RelativePath=".\smpackage\SMPackageUtil.cpp" + > + RelativePath=".\smpackage\smpackageUtil.h" + > + RelativePath=".\smpackage\StdAfx.h" + > + RelativePath=".\smpackage\TreeCtrlEx.cpp" + > + RelativePath=".\smpackage\TreeCtrlEx.h" + > + RelativePath=".\smpackage\UninstallOld.cpp" + > + RelativePath=".\smpackage\UninstallOld.h" + > + > + RelativePath=".\smpackage\resource.h" + > + RelativePath="smpackage.ICO" + > + RelativePath="res\smpackage.ico" + > + RelativePath=".\smpackage\smpackage.rc" + > + RelativePath="res\StepMania.ICO" + > + > + RelativePath=".\global.cpp" + > + RelativePath=".\global.h" + > + RelativePath=".\ProductInfo.h" + > + RelativePath=".\SpecialFiles.cpp" + > + RelativePath=".\SpecialFiles.h" + > + RelativePath=".\StdString.h" + > + Name="system" + > + RelativePath=".\archutils\Win32\AppInstance.cpp" + > + RelativePath=".\archutils\Win32\AppInstance.h" + > + RelativePath=".\archutils\Win32\arch_setup.h" + > + RelativePath=".\archutils\Win32\arch_time.cpp" + > + RelativePath=".\archutils\Win32\CommandLine.cpp" + > + RelativePath=".\archutils\Win32\CommandLine.h" + > + RelativePath=".\archutils\Win32\DialogUtil.cpp" + > + RelativePath=".\archutils\Win32\DialogUtil.h" + > + RelativePath=".\archutils\Win32\ErrorStrings.cpp" + > + RelativePath=".\archutils\Win32\ErrorStrings.h" + > + RelativePath=".\archutils\Win32\GotoURL.cpp" + > + RelativePath=".\archutils\Win32\GotoURL.h" + > + RelativePath=".\archutils\Win32\RegistryAccess.cpp" + > + RelativePath=".\archutils\Win32\RegistryAccess.h" + > + RelativePath=".\archutils\Win32\SpecialDirs.cpp" + > + RelativePath=".\archutils\Win32\SpecialDirs.h" + > + > + > + RelativePath=".\arch\Threads\Threads.h" + > + RelativePath=".\arch\Threads\Threads_Win32.cpp" + > + RelativePath=".\arch\Threads\Threads_Win32.h" + > + > + RelativePath=".\arch\ArchHooks\ArchHooks.h" + > + RelativePath=".\arch\ArchHooks\ArchHooks_Win32.h" + > + RelativePath=".\arch\ArchHooks\ArchHooks_Win32Static.cpp" + > + RelativePath=".\arch\ArchHooks\ArchHooksUtil.cpp" + > + > + RelativePath=".\arch\Dialog\Dialog.cpp" + > + RelativePath=".\arch\Dialog\Dialog.h" + > + RelativePath=".\arch\Dialog\DialogDriver.cpp" + > + RelativePath=".\arch\Dialog\DialogDriver.h" + > + RelativePath=".\arch\Dialog\DialogDriver_Win32.cpp" + > + RelativePath=".\arch\Dialog\DialogDriver_Win32.h" + > + RelativePath=".\arch\Dialog\Selector_Dialog.h" + > + > + RelativePath=".\RageException.cpp" + > + RelativePath=".\RageException.h" + > + RelativePath=".\RageFile.cpp" + > + RelativePath=".\RageFile.h" + > + RelativePath=".\RageFileBasic.cpp" + > + RelativePath=".\RageFileBasic.h" + > + RelativePath=".\RageFileDriver.cpp" + > + RelativePath=".\RageFileDriver.h" + > + RelativePath=".\RageFileDriverDeflate.cpp" + > + RelativePath=".\RageFileDriverDeflate.h" + > + RelativePath=".\RageFileDriverDirect.cpp" + > + RelativePath=".\RageFileDriverDirect.h" + > + RelativePath=".\RageFileDriverDirectHelpers.cpp" + > + RelativePath=".\RageFileDriverDirectHelpers.h" + > + RelativePath=".\RageFileDriverMemory.cpp" + > + RelativePath=".\RageFileDriverMemory.h" + > + RelativePath=".\RageFileDriverSlice.cpp" + > + RelativePath=".\RageFileDriverSlice.h" + > + RelativePath=".\RageFileDriverTimeout.cpp" + > + RelativePath=".\RageFileDriverTimeout.h" + > + RelativePath=".\RageFileDriverZip.cpp" + > + RelativePath=".\RageFileDriverZip.h" + > + RelativePath=".\RageFileManager.cpp" + > + RelativePath=".\RageFileManager.h" + > + RelativePath=".\RageLog.cpp" + > + RelativePath=".\RageLog.h" + > + RelativePath=".\RageThreads.cpp" + > + RelativePath=".\RageThreads.h" + > + RelativePath=".\RageTimer.cpp" + > + RelativePath=".\RageTimer.h" + > + RelativePath=".\RageTypes.cpp" + > + RelativePath=".\RageTypes.h" + > + RelativePath=".\RageUtil.cpp" + > + RelativePath=".\RageUtil.h" + > + RelativePath=".\RageUtil_FileDB.cpp" + > + RelativePath=".\RageUtil_FileDB.h" + > + RelativePath=".\RageUtil_WorkerThread.cpp" + > + RelativePath=".\RageUtil_WorkerThread.h" + > + > + > + RelativePath=".\pcre\get.c" + > + RelativePath=".\pcre\internal.h" + > + RelativePath=".\pcre\maketables.c" + > + RelativePath=".\pcre\pcre.c" + > + RelativePath=".\pcre\pcre.h" + > + RelativePath=".\pcre\study.c" + > + > + RelativePath=".\lua-5.1\src\lapi.c" + > + RelativePath=".\lua-5.1\src\lapi.h" + > + RelativePath=".\lua-5.1\src\lauxlib.c" + > + RelativePath=".\lua-5.1\src\lauxlib.h" + > + RelativePath=".\lua-5.1\src\lbaselib.c" + > + RelativePath=".\lua-5.1\src\lcode.c" + > + RelativePath=".\lua-5.1\src\lcode.h" + > + RelativePath=".\lua-5.1\src\ldblib.c" + > + RelativePath=".\lua-5.1\src\ldebug.c" + > + RelativePath=".\lua-5.1\src\ldebug.h" + > + RelativePath=".\lua-5.1\src\ldo.c" + > + RelativePath=".\lua-5.1\src\ldo.h" + > + RelativePath=".\lua-5.1\src\ldump.c" + > + RelativePath=".\lua-5.1\src\lfunc.c" + > + RelativePath=".\lua-5.1\src\lfunc.h" + > + RelativePath=".\lua-5.1\src\lgc.c" + > + RelativePath=".\lua-5.1\src\lgc.h" + > + RelativePath=".\lua-5.1\src\linit.c" + > + RelativePath=".\lua-5.1\src\liolib.c" + > + RelativePath=".\lua-5.1\src\llex.c" + > + RelativePath=".\lua-5.1\src\llex.h" + > + RelativePath=".\lua-5.1\src\llimits.h" + > + RelativePath=".\lua-5.1\src\lmathlib.c" + > + RelativePath=".\lua-5.1\src\lmem.c" + > + RelativePath=".\lua-5.1\src\lmem.h" + > + RelativePath=".\lua-5.1\src\loadlib.c" + > + RelativePath=".\lua-5.1\src\lobject.c" + > + RelativePath=".\lua-5.1\src\lobject.h" + > + RelativePath=".\lua-5.1\src\lopcodes.c" + > + RelativePath=".\lua-5.1\src\lopcodes.h" + > + RelativePath=".\lua-5.1\src\loslib.c" + > + RelativePath=".\lua-5.1\src\lparser.c" + > + RelativePath=".\lua-5.1\src\lparser.h" + > + RelativePath=".\lua-5.1\src\lstate.c" + > + RelativePath=".\lua-5.1\src\lstate.h" + > + RelativePath=".\lua-5.1\src\lstring.c" + > + RelativePath=".\lua-5.1\src\lstring.h" + > + RelativePath=".\lua-5.1\src\lstrlib.c" + > + RelativePath=".\lua-5.1\src\ltable.c" + > + RelativePath=".\lua-5.1\src\ltable.h" + > + RelativePath=".\lua-5.1\src\ltablib.c" + > + RelativePath=".\lua-5.1\src\ltm.c" + > + RelativePath=".\lua-5.1\src\ltm.h" + > + RelativePath=".\lua-5.1\src\lua.h" + > + RelativePath=".\lua-5.1\src\luaconf.h" + > + RelativePath=".\lua-5.1\src\lualib.h" + > + RelativePath=".\lua-5.1\src\lundump.c" + > + RelativePath=".\lua-5.1\src\lundump.h" + > + RelativePath=".\lua-5.1\src\lvm.c" + > + RelativePath=".\lua-5.1\src\lvm.h" + > + RelativePath=".\lua-5.1\src\lzio.c" + > + RelativePath=".\lua-5.1\src\lzio.h" + > + > + RelativePath=".\CsvFile.cpp" + > + RelativePath=".\CsvFile.h" + > + RelativePath=".\IniFile.cpp" + > + RelativePath=".\IniFile.h" + > + RelativePath=".\XmlFile.cpp" + > + RelativePath=".\XmlFile.h" + > + RelativePath=".\XmlFileUtil.cpp" + > + RelativePath=".\XmlFileUtil.h" + > + > + RelativePath=".\Command.cpp" + > + RelativePath=".\Command.h" + > + RelativePath=".\DateTime.cpp" + > + RelativePath=".\DateTime.h" + > + RelativePath=".\EnumHelper.cpp" + > + RelativePath=".\EnumHelper.h" + > + RelativePath=".\FontCharAliases.cpp" + > + RelativePath=".\FontCharAliases.h" + > + RelativePath=".\LocalizedString.cpp" + > + RelativePath=".\LocalizedString.h" + > + RelativePath=".\LuaBinding.cpp" + > + RelativePath=".\LuaBinding.h" + > + RelativePath=".\LuaReference.cpp" + > + RelativePath=".\LuaReference.h" + > + RelativePath=".\ThemeMetric.h" + > + > + RelativePath=".\LuaManager.cpp" + > + RelativePath=".\LuaManager.h" + > + RelativePath=".\ThemeManager.cpp" + > + RelativePath=".\ThemeManager.h" + > + RelativePath=".\smpackage\header.bmp" + > + RelativePath=".\smpackage\install.bmp" + > + RelativePath=".\smpackage\manage.bmp" + > + RelativePath=".\smpackage\menu.bmp" + > + RelativePath=".\smpackage\smpackage.ICO" + > + Value="smpackage\smpackage.rc" + /> diff --git a/src/smpackage/ZipArchive/StdAfx.h b/src/smpackage/ZipArchive/StdAfx.h index 954d9e8dcc..388ff789e1 100644 --- a/src/smpackage/ZipArchive/StdAfx.h +++ b/src/smpackage/ZipArchive/StdAfx.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////// // $Workfile: stdafx.h $ // $Archive: /ZipArchive/stdafx.h $ -// $Date: 2006-01-20 13:43:41 -0600 (Fri, 20 Jan 2006) $ $Author: gmaynard $ +// $Date: 2003-07-21 21:10:30 -0500 (Mon, 21 Jul 2003) $ $Author: gmaynard $ //////////////////////////////////////////////////////////////////////////////// // This source file is part of the ZipArchive library source distribution and // is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) @@ -38,20 +38,10 @@ #define ZIP_ARCHIVE_MFC -#if defined(_DEBUG) -#undef _DEBUG -#define RESTORE_DEBUG -#endif - #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #include #include -#if defined(RESTORE_DEBUG) -#undef RESTORE_DEBUG -#define _DEBUG -#endif - //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj b/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj index 0770070d68..dc15524a56 100644 --- a/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj +++ b/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj @@ -1,33 +1,53 @@ + Keyword="MFCProj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Debug\ZipArchive.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Release\ZipArchive.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Unicode_Static_Release\ZipArchive.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Static_Release\ZipArchive.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Unicode_Debug\ZipArchive.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Static_Debug\ZipArchive.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Unicode_Release\ZipArchive.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + @@ -378,905 +542,1142 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="StdAfx.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + UsePrecompiledHeader="1" + /> + Name="Unicode Static Release|Win32" + > + UsePrecompiledHeader="1" + /> + Name="Static Release|Win32" + > + UsePrecompiledHeader="1" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + UsePrecompiledHeader="1" + /> + RelativePath="ZipArchive.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipAutoBuffer.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipCentralDir.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipCompatibility.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipException.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipFile.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipFileHeader.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipMemFile.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipPathComponent.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipPlatform.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipPlatformComm.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipStorage.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + RelativePath="ZipString.cpp" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Static Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Name="Static Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Unicode Debug|Win32" + > + BrowseInformation="1" + /> + Name="Static Debug|Win32" + > + BrowseInformation="1" + /> + Name="Unicode Release|Win32" + > + PreprocessorDefinitions="NDEBUG;_AFXDLL;_UNICODE;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND;$(NoInherit)" + /> + Filter="h;hpp;hxx;hm;inl" + > + RelativePath="StdAfx.h" + > + RelativePath="ZipAbstractFile.h" + > + RelativePath="ZipArchive.h" + > + RelativePath="ZipAutoBuffer.h" + > + RelativePath="ZipBaseException.h" + > + RelativePath="ZipCentralDir.h" + > + RelativePath="ZipCollections.h" + > + RelativePath="ZipCompatibility.h" + > + RelativePath="ZipException.h" + > + RelativePath="ZipExport.h" + > + RelativePath="ZipFile.h" + > + RelativePath="ZipFileHeader.h" + > + RelativePath="ZipFileMapping.h" + > + RelativePath="ZipMemFile.h" + > + RelativePath="ZipPathComponent.h" + > + RelativePath="ZipPlatform.h" + > + RelativePath="ZipStorage.h" + > + RelativePath="ZipString.h" + > + Filter="txt" + > + RelativePath="Appnote.txt" + > + RelativePath="ChangeLog.txt" + > + RelativePath="faq.txt" + > + RelativePath="gpl.txt" + > + RelativePath="License.txt" + > + RelativePath="Readme.txt" + > diff --git a/src/smpackage/ZipArchive/__Windows_MFC.zcfg b/src/smpackage/ZipArchive/__Windows_MFC.zcfg index e69de29bb2..e00a2183a5 100644 --- a/src/smpackage/ZipArchive/__Windows_MFC.zcfg +++ b/src/smpackage/ZipArchive/__Windows_MFC.zcfg @@ -0,0 +1 @@ +Windows MFC From dc493450bf9f911df75e82bf7a6b975ec8aeb964 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Fri, 25 Feb 2011 02:08:30 -0800 Subject: [PATCH 2/5] Break cel shading (it'll be fixed soon, I have to poke at RageDisplay stuff), add TODOs for myself, and comment out some 2D character stuff... 2d chars should be possible to implement in lua instead. --- src/DancingCharacters.cpp | 21 +++++++++++++++++---- src/Model.cpp | 23 +++++++++++------------ 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/DancingCharacters.cpp b/src/DancingCharacters.cpp index 82186994bc..e7ba3e8e0d 100644 --- a/src/DancingCharacters.cpp +++ b/src/DancingCharacters.cpp @@ -14,6 +14,15 @@ #define DC_X( choice ) THEME->GetMetricF("DancingCharacters",ssprintf("2DCharacterXP%d",choice+1)) #define DC_Y( choice ) THEME->GetMetricF("DancingCharacters",ssprintf("2DCharacterYP%d",choice+1)) +/* + * TODO: + * - Metrics/Lua for lighting and camera sweeping. + * - Ability to load secondary elements i.e. stages. + * - Remove support for 2D characters? There's no need for them (Lua can do it). + * - Cleanup! + * + * -- Colby + */ const float CAMERA_REST_DISTANCE = 32.f; const float CAMERA_REST_LOOK_AT_HEIGHT = -11.f; @@ -247,7 +256,8 @@ void DancingCharacters::Update( float fDelta ) m_fThisCameraStartBeat = (float) iCurBeat; m_fThisCameraEndBeat = float(iCurBeat + 8); } - + /* + // is there any of this still around? This block of code is _ugly_. -Colby // update any 2D stuff FOREACH_PlayerNumber( p ) { @@ -286,6 +296,7 @@ void DancingCharacters::Update( float fDelta ) } } } + */ } void DancingCharacters::Change2DAnimState( PlayerNumber pn, int iState ) @@ -326,6 +337,7 @@ void DancingCharacters::DrawPrimitives() bool bDanger = m_bDrawDangerLight; DISPLAY->SetLighting( true ); + RageColor ambient = bFailed ? RageColor(0.2f,0.1f,0.1f,1) : (bDanger ? RageColor(0.4f,0.1f,0.1f,1) : RageColor(0.4f,0.4f,0.4f,1)); RageColor diffuse = bFailed ? RageColor(0.4f,0.1f,0.1f,1) : (bDanger ? RageColor(0.8f,0.1f,0.1f,1) : RageColor(1,0.95f,0.925f,1)); RageColor specular = RageColor(0.8f,0.8f,0.8f,1); @@ -349,12 +361,12 @@ void DancingCharacters::DrawPrimitives() DISPLAY->SetLightOff( 0 ); DISPLAY->SetLighting( false ); - - DISPLAY->ClearZBuffer(); } - DISPLAY->CameraPopMatrix(); + + /* + // Ugly! -Colby // now draw any potential 2D stuff FOREACH_PlayerNumber( p ) { @@ -375,6 +387,7 @@ void DancingCharacters::DrawPrimitives() if(m_bgFail[p].IsLoaded() && m_i2DAnimState[p] == AS2D_FAIL) m_bgFail[p]->Draw(); } + */ } /* diff --git a/src/Model.cpp b/src/Model.cpp index 55a6de8da5..df8685f404 100644 --- a/src/Model.cpp +++ b/src/Model.cpp @@ -65,6 +65,7 @@ void Model::Load( const RString &sFile ) #define THROW RageException::Throw( "Parse error in \"%s\" at line %d: \"%s\".", sPath.c_str(), iLineNum, sLine.c_str() ) +// TODO: Move MS3D loading into its own class. - Colby void Model::LoadMilkshapeAscii( const RString &sPath ) { LoadPieces( sPath, sPath, sPath ); @@ -288,19 +289,17 @@ bool Model::EarlyAbortDraw() const void Model::DrawCelShaded() { // TODO: use shell shader for outline. - this->SetGlow(RageColor(0,0,0,1)); - this->SetDiffuseAlpha(0); - DISPLAY->SetPolygonMode( POLYGON_LINE ); - DISPLAY->SetLineWidth( 3 ); - this->SetZWrite( false ); - this->Draw(); - this->SetDiffuseAlpha(1); - this->SetGlow(RageColor(1,1,1,0)); - DISPLAY->SetPolygonMode( POLYGON_FILL ); this->SetZWrite( true ); - DISPLAY->SetCelShaded( true ); + + // First pass: outline/shell +// DISPLAY->SetCelShaded(1); this->Draw(); - DISPLAY->SetCelShaded( false ); + + // Second pass: normal shading +// DISPLAY->SetCelShaded(2); +// this->Draw(); + +// DISPLAY->SetCelShaded(0) } void Model::DrawPrimitives() @@ -375,7 +374,7 @@ void Model::DrawPrimitives() } // go - DrawMesh( i ); + DrawMesh(i); // Turn off environment mapping on tex unit 0. DISPLAY->SetSphereEnvironmentMapping( TextureUnit_1, false ); From 63352110ea41fc19a3b9aadd1072cd8ccb382890 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Feb 2011 04:13:37 -0600 Subject: [PATCH 3/5] whitespace cleanup --- src/Background.h | 5 ++--- src/Foreground.h | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Background.h b/src/Background.h index b4a4622ca3..214c4b3936 100644 --- a/src/Background.h +++ b/src/Background.h @@ -23,8 +23,8 @@ public: virtual void Unload(); void FadeToActualBrightness(); - void SetBrightness( float fBrightness ); /* overrides pref and Cover */ - + void SetBrightness( float fBrightness ); // overrides pref and Cover + DancingCharacters* GetDancingCharacters(); void GetLoadedBackgroundChanges( vector **pBackgroundChangesOut ); @@ -33,7 +33,6 @@ protected: BackgroundImpl *m_pImpl; }; - #endif /* diff --git a/src/Foreground.h b/src/Foreground.h index 40e5ec1450..96f0f0a213 100644 --- a/src/Foreground.h +++ b/src/Foreground.h @@ -1,18 +1,15 @@ -/* Foreground - Foreground in front of notes while playing. */ #ifndef FOREGROUND_H #define FOREGROUND_H #include "ActorFrame.h" class Song; - +/** @brief Foreground in front of notes while playing. */ class Foreground: public ActorFrame { public: ~Foreground(); - void Unload(); - void LoadFromSong( const Song *pSong ); virtual void Update( float fDeltaTime ); From 4eb8117ee73aab15dd4866e88e35b2d107bfa9c1 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Feb 2011 04:14:34 -0600 Subject: [PATCH 4/5] whitespace, commenting... --- src/Background.cpp | 52 +++++++++++++++++++----------------------- src/Foreground.cpp | 10 ++++---- src/ScreenGameplay.cpp | 2 -- 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/src/Background.cpp b/src/Background.cpp index 1456936d65..0d3e398506 100644 --- a/src/Background.cpp +++ b/src/Background.cpp @@ -165,13 +165,13 @@ void BackgroundImpl::Init() m_bInitted = true; m_bDangerAllWasVisible = false; m_StaticBackgroundDef = BackgroundDef(); - + if( !USE_STATIC_BG ) { m_StaticBackgroundDef.m_sColor1 = "#00000000"; m_StaticBackgroundDef.m_sColor2 = "#00000000"; } - + // load transitions { ASSERT( m_mapNameToTransition.empty() ); @@ -204,7 +204,7 @@ void BackgroundImpl::Init() FOREACH_HumanPlayer( p ) { bOneOrMoreChars = true; - // Disable dancing characters if BH will be showing. + // Disable dancing characters if Beginner Helper will be showing. if( PREFSMAN->m_bShowBeginnerHelper && BeginnerHelper::CanUse() && GAMESTATE->m_pCurSteps[p] && GAMESTATE->m_pCurSteps[p]->GetDifficulty() == Difficulty_Beginner ) bShowingBeginnerHelper = true; @@ -285,10 +285,11 @@ bool BackgroundImpl::Layer::CreateBackground( const Song *pSong, const Backgroun continue; } - // Look for vsFileToResolve[i] in: - // - song's dir - // - RandomMovies dir - // - BGAnimations dir. + /* Look for vsFileToResolve[i] in: + * song's dir + * RandomMovies dir + * BGAnimations dir. + */ vector vsPaths, vsThrowAway; // Look for BGAnims in the song dir @@ -403,7 +404,7 @@ BackgroundDef BackgroundImpl::Layer::CreateRandomBGA( const Song *pSong, const R bd.m_sEffect = sEffect; map::const_iterator iter = m_BGAnimations.find( bd ); - + // create the background if it's not already created if( iter == m_BGAnimations.end() ) { @@ -517,7 +518,7 @@ void BackgroundImpl::LoadFromSong( const Song* pSong ) m_RandomBGAnimations.push_back( bd ); } } - + /* Song backgrounds (even just background stills) can get very big; never keep them * in memory. */ RageTextureID::TexPolicy OldPolicy = TEXTUREMAN->GetDefaultTexturePolicy(); @@ -594,12 +595,10 @@ void BackgroundImpl::LoadFromSong( const Song* pSong ) BackgroundUtil::SortBackgroundChangesArray( layer.m_aBGChanges ); } - Layer &mainlayer = m_Layer[0]; - - /* If the first BGAnimation isn't negative, add a lead-in image showing the song - * background. */ + /* If the first BGAnimation isn't negative, add a lead-in image showing + * the song background. */ if( mainlayer.m_aBGChanges.empty() || mainlayer.m_aBGChanges.front().m_fStartBeat >= 0 ) { BackgroundChange change; @@ -636,7 +635,6 @@ void BackgroundImpl::LoadFromSong( const Song* pSong ) } } - // Look for the random file marker, and replace the segment with LoadFromRandom. for( unsigned i=0; i=0; i-- ) @@ -689,7 +686,7 @@ int BackgroundImpl::Layer::FindBGSegmentForBeat( float fBeat ) const return i; } -/* If the BG segment has changed, move focus to it. Send Update() calls. */ +/* If the BG segment has changed, move focus to it. Send Update() calls. */ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMusicSeconds, float fCurrentTime, const map &mapNameToTransition ) { ASSERT( fCurrentTime != GameState::MUSIC_SECONDS_INVALID ); @@ -702,7 +699,7 @@ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMus int iThrowAway; pSong->m_Timing.GetBeatAndBPSFromElapsedTime( fCurrentTime, fBeat, fBPS, bFreeze, bFreeze, iThrowAway, fThrowAway ); - /* Calls to Update() should *not* be scaled by music rate; fCurrentTime is. Undo it. */ + // Calls to Update() should *not* be scaled by music rate; fCurrentTime is. Undo it. const float fRate = GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate; // Find the BGSegment we're in @@ -711,7 +708,7 @@ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMus float fDeltaTime = fCurrentTime - fLastMusicSeconds; if( i != -1 && i != m_iCurBGChangeIndex ) // we're changing backgrounds { -// LOG->Trace( "old bga %d -> new bga %d (%s), %f, %f", m_iCurBGChangeIndex, i, m_aBGChanges[i].GetTextDescription().c_str(), m_aBGChanges[i].m_fStartBeat, fBeat ); + //LOG->Trace( "old bga %d -> new bga %d (%s), %f, %f", m_iCurBGChangeIndex, i, m_aBGChanges[i].GetTextDescription().c_str(), m_aBGChanges[i].m_fStartBeat, fBeat ); BackgroundChange oldChange; if( m_iCurBGChangeIndex != -1 ) @@ -739,7 +736,7 @@ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMus if( m_pFadingBGA == m_pCurrentBGA ) { m_pFadingBGA = NULL; -// LOG->Trace( "bg didn't actually change. Ignoring." ); + //LOG->Trace( "bg didn't actually change. Ignoring." ); } else { @@ -819,11 +816,11 @@ void BackgroundImpl::DrawPrimitives() if( m_pDancingCharacters ) m_pDancingCharacters->m_bDrawDangerLight = true; } - - { + + { if( m_pDancingCharacters ) m_pDancingCharacters->m_bDrawDangerLight = false; - + FOREACH_BackgroundLayer( i ) { Layer &layer = m_Layer[i]; @@ -890,8 +887,8 @@ BrightnessOverlay::BrightnessOverlay() void BrightnessOverlay::Update( float fDeltaTime ) { ActorFrame::Update( fDeltaTime ); - /* If we're actually playing, then we're past fades, etc; update the background - * brightness to follow Cover. */ + /* If we're actually playing, then we're past fades, etc; update the + * background brightness to follow Cover. */ if( !GAMESTATE->m_bGameplayLeadIn ) SetActualBrightness(); } @@ -906,7 +903,7 @@ void BrightnessOverlay::SetActualBrightness() // HACK: Always show training in full brightness if( GAMESTATE->m_pCurSong && GAMESTATE->m_pCurSong->IsTutorial() ) fBaseBGBrightness = 1.0f; - + fLeftBrightness *= fBaseBGBrightness; fRightBrightness *= fBaseBGBrightness; @@ -939,8 +936,6 @@ void BrightnessOverlay::FadeToActualBrightness() SetActualBrightness(); } - - Background::Background() { m_pImpl = new BackgroundImpl; this->AddChild(m_pImpl); } Background::~Background() { SAFE_DELETE( m_pImpl ); } void Background::Init() { m_pImpl->Init(); } @@ -951,7 +946,6 @@ void Background::SetBrightness( float fBrightness ) { m_pImpl->SetBrightness(fBr DancingCharacters* Background::GetDancingCharacters() { return m_pImpl->GetDancingCharacters(); } void Background::GetLoadedBackgroundChanges( vector *pBackgroundChangesOut[NUM_BackgroundLayer] ) { m_pImpl->GetLoadedBackgroundChanges(pBackgroundChangesOut); } - /* * (c) 2001-2004 Chris Danford, Ben Nordstrom * All rights reserved. diff --git a/src/Foreground.cpp b/src/Foreground.cpp index c04d29cfcb..84caac9025 100644 --- a/src/Foreground.cpp +++ b/src/Foreground.cpp @@ -25,7 +25,7 @@ void Foreground::Unload() void Foreground::LoadFromSong( const Song *pSong ) { - /* Song graphics can get very big; never keep them in memory. */ + // Song graphics can get very big; never keep them in memory. RageTextureID::TexPolicy OldPolicy = TEXTUREMAN->GetDefaultTexturePolicy(); TEXTUREMAN->SetDefaultTexturePolicy( RageTextureID::TEX_VOLATILE ); @@ -58,7 +58,7 @@ void Foreground::LoadFromSong( const Song *pSong ) void Foreground::Update( float fDeltaTime ) { - /* Calls to Update() should *not* be scaled by music rate. Undo it. */ + // Calls to Update() should *not* be scaled by music rate. Undo it. const float fRate = GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate; for( unsigned i=0; i < m_BGAnimations.size(); ++i ) @@ -67,7 +67,7 @@ void Foreground::Update( float fDeltaTime ) if( GAMESTATE->m_fSongBeat < bga.m_fStartBeat ) { - /* The animation hasn't started yet. */ + // The animation hasn't started yet. continue; } @@ -89,14 +89,14 @@ void Foreground::Update( float fDeltaTime ) fDeltaTime = GAMESTATE->m_fMusicSeconds - m_fLastMusicSeconds; } - /* This shouldn't go down, but be safe: */ + // This shouldn't go down, but be safe: fDeltaTime = max( fDeltaTime, 0 ); bga.m_bga->Update( fDeltaTime / fRate ); if( GAMESTATE->m_fSongBeat > bga.m_fStopBeat ) { - /* Finished. */ + // Finished. bga.m_bga->SetVisible( false ); bga.m_bFinished = true; continue; diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 251c73aa1d..6d37d74d3a 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -1210,13 +1210,11 @@ void ScreenGameplay::LoadNextSong() if( m_pCombinedLifeMeter ) m_pCombinedLifeMeter->OnLoadSong(); - if( m_pSongForeground ) m_pSongForeground->LoadFromSong( GAMESTATE->m_pCurSong ); m_fTimeSinceLastDancingComment = 0; - /* m_soundMusic and m_pSongBackground take a very long time to load, * so cap fDelta at 0 so m_NextSong will show up on screen. * -Chris */ From 38007eac91779382947b32e90a88d14a2b389894 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Feb 2011 04:19:44 -0600 Subject: [PATCH 5/5] cleanup of whitespace again --- src/DancingCharacters.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/DancingCharacters.cpp b/src/DancingCharacters.cpp index e7ba3e8e0d..ff4ba85776 100644 --- a/src/DancingCharacters.cpp +++ b/src/DancingCharacters.cpp @@ -18,7 +18,7 @@ * TODO: * - Metrics/Lua for lighting and camera sweeping. * - Ability to load secondary elements i.e. stages. - * - Remove support for 2D characters? There's no need for them (Lua can do it). + * - Remove support for 2D characters (Lua can do it). * - Cleanup! * * -- Colby @@ -43,7 +43,6 @@ const float MODEL_X_ONE_PLAYER = 0; const float MODEL_X_TWO_PLAYERS[NUM_PLAYERS] = { +8, -8 }; const float MODEL_ROTATIONY_TWO_PLAYERS[NUM_PLAYERS] = { -90, 90 }; - DancingCharacters::DancingCharacters() { m_bDrawDangerLight = false; @@ -68,28 +67,28 @@ DancingCharacters::DancingCharacters() { m_bgIdle[p].Load( sCurrentAnim ); m_bgIdle[p]->SetXY(DC_X(p),DC_Y(p)); - } + } sCurrentAnim = sCharacterDirectory + "2DMiss"; if( DoesFileExist(sCurrentAnim + "/BGAnimation.ini") ) // check 2D Idle BGAnim exists { m_bgMiss[p].Load( sCurrentAnim ); m_bgMiss[p]->SetXY(DC_X(p),DC_Y(p)); - } + } sCurrentAnim = sCharacterDirectory + "2DGood"; if( DoesFileExist(sCurrentAnim + "/BGAnimation.ini") ) // check 2D Idle BGAnim exists { m_bgGood[p].Load( sCurrentAnim ); m_bgGood[p]->SetXY(DC_X(p),DC_Y(p)); - } + } sCurrentAnim = sCharacterDirectory + "2DGreat"; if( DoesFileExist(sCurrentAnim + "/BGAnimation.ini") ) // check 2D Idle BGAnim exists { m_bgGreat[p].Load( sCurrentAnim ); m_bgGreat[p]->SetXY(DC_X(p),DC_Y(p)); - } + } sCurrentAnim = sCharacterDirectory + "2DFever"; if( DoesFileExist(sCurrentAnim + "/BGAnimation.ini") ) // check 2D Idle BGAnim exists @@ -121,12 +120,12 @@ DancingCharacters::DancingCharacters() if( pChar->GetModelPath().empty() ) continue; - + if( GAMESTATE->GetNumPlayersEnabled()==2 ) m_pCharacter[p]->SetX( MODEL_X_TWO_PLAYERS[p] ); else m_pCharacter[p]->SetX( MODEL_X_ONE_PLAYER ); - + switch( GAMESTATE->m_PlayMode ) { case PLAY_MODE_BATTLE: @@ -165,7 +164,7 @@ void DancingCharacters::LoadNextSong() ASSERT( GAMESTATE->m_pCurSong ); m_fThisCameraEndBeat = GAMESTATE->m_pCurSong->m_fFirstBeat; - + FOREACH_PlayerNumber( p ) if( GAMESTATE->IsPlayerEnabled(p) ) m_pCharacter[p]->PlayAnimation( "rest" ); @@ -177,7 +176,7 @@ void DancingCharacters::Update( float fDelta ) { if( GAMESTATE->m_bFreeze || GAMESTATE->m_bDelay ) { - // spin the camera Matrix style + // spin the camera Matrix-style m_CameraPanYStart += fDelta*40; m_CameraPanYEnd += fDelta*40; } @@ -209,7 +208,6 @@ void DancingCharacters::Update( float fDelta ) } bWasGameplayStarting = bGameplayStarting; - static float fLastBeat = GAMESTATE->m_fSongBeat; float fThisBeat = GAMESTATE->m_fSongBeat; if( fLastBeat < GAMESTATE->m_pCurSong->m_fFirstBeat && @@ -220,7 +218,6 @@ void DancingCharacters::Update( float fDelta ) } fLastBeat = fThisBeat; - // time for a new sweep? if( GAMESTATE->m_fSongBeat > m_fThisCameraEndBeat ) { @@ -230,7 +227,7 @@ void DancingCharacters::Update( float fDelta ) m_CameraDistance = CAMERA_SWEEP_DISTANCE + RandomInt(-1,1) * CAMERA_SWEEP_DISTANCE_VARIANCE; m_CameraPanYStart = m_CameraPanYEnd = RandomInt(-1,1) * CAMERA_SWEEP_PAN_Y_RANGE_DEGREES; m_fCameraHeightStart = m_fCameraHeightEnd = CAMERA_STILL_LOOK_AT_HEIGHT; - + m_CameraPanYEnd += RandomInt(-1,1) * CAMERA_SWEEP_PAN_Y_VARIANCE_DEGREES; m_fCameraHeightStart = m_fCameraHeightEnd = m_fCameraHeightStart + RandomInt(-1,1) * CAMERA_SWEEP_HEIGHT_VARIANCE; @@ -337,7 +334,7 @@ void DancingCharacters::DrawPrimitives() bool bDanger = m_bDrawDangerLight; DISPLAY->SetLighting( true ); - + RageColor ambient = bFailed ? RageColor(0.2f,0.1f,0.1f,1) : (bDanger ? RageColor(0.4f,0.1f,0.1f,1) : RageColor(0.4f,0.4f,0.4f,1)); RageColor diffuse = bFailed ? RageColor(0.4f,0.1f,0.1f,1) : (bDanger ? RageColor(0.8f,0.1f,0.1f,1) : RageColor(1,0.95f,0.925f,1)); RageColor specular = RageColor(0.8f,0.8f,0.8f,1); @@ -364,7 +361,7 @@ void DancingCharacters::DrawPrimitives() } DISPLAY->CameraPopMatrix(); - + /* // Ugly! -Colby // now draw any potential 2D stuff