Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- some performance improvements
- "daily build". The daily build was compiled in "profile" mode. If you have problems running the exe, or problems with Visual Studio please let me know
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-10-08 12:17:07 +00:00
parent e4a277f9ff
commit 46ef86b9d8
10 changed files with 348 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/JGE.vcproj
+207
View File
@@ -164,6 +164,83 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Profile|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="Dependencies/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_HAS_ITERATOR_DEBBUGING=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/JGE.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="3081"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="lib\win\jge.lib"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBCMT"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
@@ -204,6 +281,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\JDistortionMesh.cpp" RelativePath="src\JDistortionMesh.cpp"
@@ -229,6 +316,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\JFileSystem.cpp" RelativePath="src\JFileSystem.cpp"
@@ -254,6 +351,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\JGameObject.cpp" RelativePath="src\JGameObject.cpp"
@@ -279,6 +386,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\JGBKFont.cpp" RelativePath="src\JGBKFont.cpp"
@@ -304,6 +421,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\JGE.cpp" RelativePath="src\JGE.cpp"
@@ -329,6 +456,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\JGui.cpp" RelativePath="src\JGui.cpp"
@@ -354,6 +491,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\src\JInputSystem.cpp" RelativePath=".\src\JInputSystem.cpp"
@@ -383,6 +530,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\src\JMD2Model.cpp" RelativePath=".\src\JMD2Model.cpp"
@@ -456,6 +613,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\src\JTTFont.cpp" RelativePath=".\src\JTTFont.cpp"
@@ -485,6 +652,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\src\winmain.cpp" RelativePath=".\src\winmain.cpp"
@@ -743,6 +920,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\unzip\ioapi.h" RelativePath="src\unzip\ioapi.h"
@@ -772,6 +959,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\unzip\mztools.h" RelativePath="src\unzip\mztools.h"
@@ -801,6 +998,16 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\unzip\unzip.h" RelativePath="src\unzip\unzip.h"
JGE/lib/win/jge.lib
BIN
View File
Binary file not shown.
projects/mtg/bin/daily_build/template.exe
BIN
View File
Binary file not shown.
projects/mtg/include/MTGCardInstance.h
+1
View File
@@ -43,6 +43,7 @@ class MTGCardInstance: public MTGCard, public Damageable {
int removeBlocker(MTGCardInstance * c); int removeBlocker(MTGCardInstance * c);
int setAttacker(int value); int setAttacker(int value);
public: public:
MTGGameZone * currentZone;
Pos* view; Pos* view;
int regenerateTokens; int regenerateTokens;
bool isToken; bool isToken;
projects/mtg/include/Subtypes.h
+2 -2
View File
@@ -9,9 +9,9 @@ using std::map;
class Subtypes{ class Subtypes{
protected: protected:
int nb_items;
map<string,int> values; map<string,int> values;
map<int,string> valuesById;
int nb_items;
public: public:
static Subtypes * subtypesList; static Subtypes * subtypesList;
Subtypes(); Subtypes();
projects/mtg/mtg.sln
+5
View File
@@ -8,15 +8,20 @@ EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Profile|Win32 = Profile|Win32
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{53024371-2293-4D40-8ECF-FCB470B50DA1}.Debug|Win32.ActiveCfg = Debug|Win32 {53024371-2293-4D40-8ECF-FCB470B50DA1}.Debug|Win32.ActiveCfg = Debug|Win32
{53024371-2293-4D40-8ECF-FCB470B50DA1}.Debug|Win32.Build.0 = Debug|Win32 {53024371-2293-4D40-8ECF-FCB470B50DA1}.Debug|Win32.Build.0 = Debug|Win32
{53024371-2293-4D40-8ECF-FCB470B50DA1}.Profile|Win32.ActiveCfg = Profile|Win32
{53024371-2293-4D40-8ECF-FCB470B50DA1}.Profile|Win32.Build.0 = Profile|Win32
{53024371-2293-4D40-8ECF-FCB470B50DA1}.Release|Win32.ActiveCfg = Release|Win32 {53024371-2293-4D40-8ECF-FCB470B50DA1}.Release|Win32.ActiveCfg = Release|Win32
{53024371-2293-4D40-8ECF-FCB470B50DA1}.Release|Win32.Build.0 = Release|Win32 {53024371-2293-4D40-8ECF-FCB470B50DA1}.Release|Win32.Build.0 = Release|Win32
{89159C26-2282-404A-A194-103B0A49DF7B}.Debug|Win32.ActiveCfg = Debug|Win32 {89159C26-2282-404A-A194-103B0A49DF7B}.Debug|Win32.ActiveCfg = Debug|Win32
{89159C26-2282-404A-A194-103B0A49DF7B}.Debug|Win32.Build.0 = Debug|Win32 {89159C26-2282-404A-A194-103B0A49DF7B}.Debug|Win32.Build.0 = Debug|Win32
{89159C26-2282-404A-A194-103B0A49DF7B}.Profile|Win32.ActiveCfg = Profile|Win32
{89159C26-2282-404A-A194-103B0A49DF7B}.Profile|Win32.Build.0 = Profile|Win32
{89159C26-2282-404A-A194-103B0A49DF7B}.Release|Win32.ActiveCfg = Release|Win32 {89159C26-2282-404A-A194-103B0A49DF7B}.Release|Win32.ActiveCfg = Release|Win32
{89159C26-2282-404A-A194-103B0A49DF7B}.Release|Win32.Build.0 = Release|Win32 {89159C26-2282-404A-A194-103B0A49DF7B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
projects/mtg/src/MTGCardInstance.cpp
+2 -20
View File
@@ -106,6 +106,7 @@ void MTGCardInstance::initMTGCI(){
lastController = NULL; lastController = NULL;
regenerateTokens = 0; regenerateTokens = 0;
blocked = false; blocked = false;
currentZone = NULL;
} }
@@ -184,16 +185,7 @@ int MTGCardInstance::destroy(){
} }
MTGGameZone * MTGCardInstance::getCurrentZone(){ MTGGameZone * MTGCardInstance::getCurrentZone(){
GameObserver * game = GameObserver::GetInstance(); return currentZone;
for (int i = 0; i < 2; i++){
MTGPlayerCards * g = game->players[i]->game;
MTGGameZone * zones[] = {g->inPlay,g->graveyard,g->hand, g->library, g->stack, g->temp};
for (int k = 0; k < 6; k++){
MTGGameZone * zone = zones[k];
if (zone->hasCard(this)) return zone;
}
}
return NULL;
} }
int MTGCardInstance::has(int basicAbility){ int MTGCardInstance::has(int basicAbility){
@@ -319,16 +311,6 @@ int MTGCardInstance::reset(){
Player * MTGCardInstance::controller(){ Player * MTGCardInstance::controller(){
GameObserver * game = GameObserver::GetInstance();
if (!game) return NULL;
for (int i = 0; i < 2; ++i){
if (game->players[i]->game->inPlay->hasCard(this)) return game->players[i];
if (game->players[i]->game->stack->hasCard(this)) return game->players[i];
if (game->players[i]->game->graveyard->hasCard(this)) return game->players[i];
if (game->players[i]->game->hand->hasCard(this)) return game->players[i];
if (game->players[i]->game->library->hasCard(this)) return game->players[i];
if (game->players[i]->game->temp->hasCard(this)) return game->players[i];
}
return lastController; return lastController;
} }
projects/mtg/src/MTGGameZones.cpp
+4 -1
View File
@@ -186,6 +186,7 @@ MTGGameZone::~MTGGameZone(){
void MTGGameZone::setOwner(Player * player){ void MTGGameZone::setOwner(Player * player){
for (int i=0; i<nb_cards; i++) { for (int i=0; i<nb_cards; i++) {
cards[i]->owner = player; cards[i]->owner = player;
cards[i]->lastController = player;
} }
owner = player; owner = player;
} }
@@ -195,6 +196,7 @@ MTGCardInstance * MTGGameZone::removeCard(MTGCardInstance * card, int createCopy
cardsMap.erase(card); cardsMap.erase(card);
for (i=0; i<(nb_cards); i++) { for (i=0; i<(nb_cards); i++) {
if (cards[i] == card){ if (cards[i] == card){
card->currentZone = NULL;
nb_cards--; nb_cards--;
cards.erase(cards.begin()+i); cards.erase(cards.begin()+i);
MTGCardInstance * copy = card; MTGCardInstance * copy = card;
@@ -216,7 +218,7 @@ MTGCardInstance * MTGGameZone::removeCard(MTGCardInstance * card, int createCopy
} }
MTGCardInstance * MTGGameZone::hasCard(MTGCardInstance * card){ MTGCardInstance * MTGGameZone::hasCard(MTGCardInstance * card){
if (cardsMap.find(card) != cardsMap.end()) return card; if (card->currentZone == this) return card;
return NULL; return NULL;
} }
@@ -273,6 +275,7 @@ void MTGGameZone::addCard(MTGCardInstance * card){
nb_cards++; nb_cards++;
cardsMap[card] = 1; cardsMap[card] = 1;
card->lastController = this->owner; card->lastController = this->owner;
card->currentZone = this;
} }
projects/mtg/src/Subtypes.cpp
+4 -6
View File
@@ -17,6 +17,7 @@ int Subtypes::Add(string value){
std::transform( value.begin(), value.end(), value.begin(), ::tolower ); std::transform( value.begin(), value.end(), value.begin(), ::tolower );
nb_items++; nb_items++;
values[value] = nb_items; values[value] = nb_items;
valuesById[nb_items] = value;
return nb_items; return nb_items;
} }
@@ -39,11 +40,8 @@ int Subtypes::find(const char * subtype){
} }
/*This will be slow... */
string Subtypes::find(int id){ string Subtypes::find(int id){
map<string,int>::iterator it; map<int,string>::iterator it=valuesById.find(id);;
for (it = values.begin(); it != values.end(); it++){ if (it != valuesById.end()) return it->second;
if (it->second == id) return it->first; return "";
}
return NULL;
} }
projects/mtg/template.vcproj
+123 -6
View File
@@ -208,6 +208,105 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Profile|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Release/template.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../JGE/include;../../JGE/Dependencies/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SECURE_SCL=0;_HAS_ITERATOR_DEBBUGING=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/template.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="3081"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib libpng.lib fmodvc.lib zdll.lib jge.lib libjpeg-static-mt.lib freetype.lib"
OutputFile="bin/template.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\JGE\Dependencies\lib,..\..\JGE\lib\win"
IgnoreDefaultLibraryNames="LIBCD,LIBCMT"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Release/template.pdb"
SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/template.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
@@ -317,6 +416,15 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="src\GameLauncher.cpp" RelativePath="src\GameLauncher.cpp"
@@ -339,6 +447,15 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Profile|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\src\GameObserver.cpp" RelativePath=".\src\GameObserver.cpp"
@@ -553,11 +670,11 @@
> >
</File> </File>
<File <File
RelativePath=".\src\WEvent.cpp" RelativePath=".\src\WCachedResource.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\WCachedResource.cpp" RelativePath=".\src\WEvent.cpp"
> >
</File> </File>
<File <File
@@ -905,6 +1022,10 @@
RelativePath=".\include\utils.h" RelativePath=".\include\utils.h"
> >
</File> </File>
<File
RelativePath=".\include\WCachedResource.h"
>
</File>
<File <File
RelativePath=".\include\WEvent.h" RelativePath=".\include\WEvent.h"
> >
@@ -913,10 +1034,6 @@
RelativePath=".\include\WResourceManager.h" RelativePath=".\include\WResourceManager.h"
> >
</File> </File>
<File
RelativePath=".\include\WCachedResource.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"