Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
13ac4fc9dd |
@ -918,8 +918,8 @@ void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, i
|
|||||||
}
|
}
|
||||||
|
|
||||||
// :::::::::::
|
// :::::::::::
|
||||||
*SE::Console << BkgTexture;
|
GetConsole() << BkgTexture;
|
||||||
*SE::Console << std::to_string(ResourceManager->TexList[BkgTexture]);
|
GetConsole() << std::to_string(ResourceManager->TexList[BkgTexture]);
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_2D,ResourceManager->TexList[BkgTexture]);
|
glBindTexture(GL_TEXTURE_2D,ResourceManager->TexList[BkgTexture]);
|
||||||
//Renderer->DrawRect(Vector2f(xlOffset, ylOffset), Vector2f(xlOffset+tSW, ylOffset+tSH),Vector2f(0.f, 0.f), Vector2f(1.f, 1.f));
|
//Renderer->DrawRect(Vector2f(xlOffset, ylOffset), Vector2f(xlOffset+tSW, ylOffset+tSH),Vector2f(0.f, 0.f), Vector2f(1.f, 1.f));
|
||||||
|
@ -137,8 +137,8 @@ void TMyApplication::InnerInit()
|
|||||||
|
|
||||||
#ifdef TARGET_WIN32
|
#ifdef TARGET_WIN32
|
||||||
#ifdef NDEBUG
|
#ifdef NDEBUG
|
||||||
ST::PathToResources = "resources/";
|
//ST::PathToResources = "resources/";
|
||||||
//ST::PathToResources = "../../../assets/";
|
ST::PathToResources = "../../../assets/";
|
||||||
#else
|
#else
|
||||||
ST::PathToResources = "../../../assets/";
|
ST::PathToResources = "../../../assets/";
|
||||||
#endif
|
#endif
|
||||||
@ -152,10 +152,9 @@ void TMyApplication::InnerInit()
|
|||||||
ST::PathToResources = "";
|
ST::PathToResources = "";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (Console != NULL)
|
|
||||||
{
|
GetConsole() <<"APP INIT\n";
|
||||||
*Console<<"APP INIT\n";
|
|
||||||
}
|
|
||||||
srand (static_cast<size_t>(time(NULL)));
|
srand (static_cast<size_t>(time(NULL)));
|
||||||
GameState = CONST_GAMESTATE_PRELOADING;
|
GameState = CONST_GAMESTATE_PRELOADING;
|
||||||
StateTimer = 0.f;
|
StateTimer = 0.f;
|
||||||
@ -222,10 +221,8 @@ void TMyApplication::InnerDeinit()
|
|||||||
{
|
{
|
||||||
Inited = false;
|
Inited = false;
|
||||||
Loaded = false;
|
Loaded = false;
|
||||||
if (Console != NULL)
|
GetConsole() <<"APP DEINIT\n";
|
||||||
{
|
|
||||||
*Console<<"APP DEINIT\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
OnTapUpSignal.disconnect(boost::bind(&TGameLevel::OnTapUp, boost::ref(GameLevel), _1));
|
OnTapUpSignal.disconnect(boost::bind(&TGameLevel::OnTapUp, boost::ref(GameLevel), _1));
|
||||||
OnTapUpSignal.disconnect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1));
|
OnTapUpSignal.disconnect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1));
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<ProjectGuid>{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}</ProjectGuid>
|
<ProjectGuid>{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}</ProjectGuid>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<RootNamespace>DoubleHitBallswin</RootNamespace>
|
<RootNamespace>DoubleHitBallswin</RootNamespace>
|
||||||
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
Loading…
Reference in New Issue
Block a user