catch up
This commit is contained in:
parent
8623958378
commit
98b286d129
@ -428,13 +428,7 @@ void TGameLevel::ReloadBlockInstansingList()
|
||||
|
||||
std::pair<vec4, std::string> tempPair;
|
||||
BlockInstansingList.ColorBlockList.clear();
|
||||
/*
|
||||
vec2 tex1 = vec2(0, 0);
|
||||
vec2 tex2 = vec2(0, 1);
|
||||
vec2 tex3 = vec2(1, 1);
|
||||
vec2 tex4 = vec2(1, 0);
|
||||
*/
|
||||
|
||||
|
||||
for (int i=0; i<CONST_BRICKMATRIX_WIDTH; i++)
|
||||
{
|
||||
for (int j=0; j<CONST_BRICKMATRIX_HEIGHT; j++)
|
||||
@ -443,19 +437,14 @@ void TGameLevel::ReloadBlockInstansingList()
|
||||
{
|
||||
tempPair.first = BlockMatrix[i][j].GetColor();
|
||||
tempPair.second = ConstTextureBlockMap[BlockMatrix[i][j].GetLocked()];
|
||||
/*
|
||||
vec2 pos1 = BlockMatrix[i][j].GetPosFrom(i,j) + vec2(-0.5f*CONST_BRICK_WIDTH, -0.5f*CONST_BRICK_HEIGHT);
|
||||
vec2 pos2 = BlockMatrix[i][j].GetPosFrom(i,j) + vec2(-0.5f*CONST_BRICK_WIDTH, +0.5f*CONST_BRICK_HEIGHT);
|
||||
vec2 pos3 = BlockMatrix[i][j].GetPosFrom(i,j) + vec2(+0.5f*CONST_BRICK_WIDTH, +0.5f*CONST_BRICK_HEIGHT);
|
||||
vec2 pos4 = BlockMatrix[i][j].GetPosFrom(i,j) + vec2(+0.5f*CONST_BRICK_WIDTH, -0.5f*CONST_BRICK_HEIGHT);
|
||||
*/
|
||||
|
||||
std::list<std::pair<PairColorTexture, TTriangleList>>::iterator itr = BlockInstansingList.ColorBlockList.end();
|
||||
|
||||
for (auto i = BlockInstansingList.ColorBlockList.begin(); i != BlockInstansingList.ColorBlockList.end(); ++i)
|
||||
for (auto b = BlockInstansingList.ColorBlockList.begin(); b != BlockInstansingList.ColorBlockList.end(); ++b)
|
||||
{
|
||||
if (i->first == tempPair)
|
||||
if (b->first == tempPair)
|
||||
{
|
||||
itr = i;
|
||||
itr = b;
|
||||
}
|
||||
}
|
||||
|
||||
@ -472,23 +461,6 @@ void TGameLevel::ReloadBlockInstansingList()
|
||||
|
||||
itr->second.Data += MakeDataTriangleList(posFrom, posTo);
|
||||
|
||||
/*
|
||||
itr->second.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(vec3(pos1, 0));
|
||||
itr->second.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(vec3(pos2, 0));
|
||||
itr->second.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(vec3(pos3, 0));
|
||||
|
||||
itr->second.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(vec3(pos3, 0));
|
||||
itr->second.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(vec3(pos4, 0));
|
||||
itr->second.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(vec3(pos1, 0));
|
||||
|
||||
itr->second.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(tex1);
|
||||
itr->second.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(tex2);
|
||||
itr->second.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(tex3);
|
||||
|
||||
itr->second.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(tex3);
|
||||
itr->second.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(tex4);
|
||||
itr->second.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(tex1);
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -834,6 +806,7 @@ void TGameLevel::Draw()
|
||||
//ololo
|
||||
//See also above (same method)
|
||||
Renderer->SwitchToScreen();
|
||||
Renderer->SetFullScreenViewport();
|
||||
|
||||
Renderer->PushMatrix();
|
||||
//Renderer->LoadIdentity();
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
|
||||
void TGameLoading::Draw()
|
||||
{
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D,ResourceManager->TexList[CONST_LOADING_TEXTURE]);
|
||||
Renderer->DrawRect(vec2(240.f - 128.f, 10.f), vec2(240.f + 128.f, 10.f + 64.f));
|
||||
|
||||
@ -11,4 +12,5 @@ void TGameLoading::Draw()
|
||||
Renderer->DrawRect(vec2(480.f - 256.f+50.f, 320.f - 64.f), vec2(480.f+50.f, 320.f));
|
||||
|
||||
CheckGlError();
|
||||
|
||||
}
|
||||
|
||||
@ -68,11 +68,12 @@ void TAndroidApplication::InnerInit()
|
||||
srand (static_cast<cardinal>(time(NULL)));
|
||||
GameState = CONST_GAMESTATE_PRELOADING;
|
||||
StateTimer = 0.f;
|
||||
|
||||
|
||||
ResourceManager->ShaderManager.AddShader("TestShader", "shader1vertex.txt", "shader1fragment.txt");
|
||||
ResourceManager->ShaderManager.AddShader("DefaultShader", "shader1vertex.txt", "shader1fragment.txt");
|
||||
ResourceManager->ShaderManager.AddShader("FrameShader", "frameshader_vertex.txt", "frameshader_fragment.txt");
|
||||
ResourceManager->ShaderManager.AddShader("BrickShader", "brickshader_vertex.txt", "brickshader_fragment.txt");
|
||||
Renderer->PushShader("TestShader");
|
||||
Renderer->PushShader("DefaultShader");
|
||||
|
||||
ResourceManager->TexList.AddTexture(CONST_LOADING_TEXTURE + ".png", CONST_LOADING_TEXTURE);
|
||||
ResourceManager->TexList.AddTexture(CONST_LOGO_SMALL_TEXTURE + ".png", CONST_LOGO_SMALL_TEXTURE);
|
||||
@ -84,9 +85,12 @@ void TAndroidApplication::InnerInit()
|
||||
OnDrawSignal.connect(boost::bind(&TGameLoading::Draw, boost::ref(GameLoading)));
|
||||
Inited = true;
|
||||
|
||||
#ifndef TARGET_IOS
|
||||
Renderer->SwitchToScreen();
|
||||
#endif
|
||||
Renderer->SetOrthoProjection();
|
||||
|
||||
Renderer->SetFullScreenViewport();
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
void TAndroidApplication::InnerDeinit()
|
||||
@ -319,8 +323,13 @@ void TAndroidApplication::TrySaveGame()
|
||||
|
||||
void TAndroidApplication::InnerDraw()
|
||||
{
|
||||
|
||||
glDisable(GL_DEPTH_TEST);
|
||||
|
||||
|
||||
OnDrawSignal();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -110,6 +110,26 @@ public class GL2JNIActivity extends Activity
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
if (event.getAction() == MotionEvent.ACTION_MOVE)
|
||||
{
|
||||
float x = event.getX();
|
||||
float y = (float)mView.getHeight()-event.getY();
|
||||
|
||||
|
||||
|
||||
float shiftX = x - event.getHistoricalX(0, event.getHistorySize()-2);
|
||||
|
||||
if(IsScrolling)
|
||||
{
|
||||
IsScrolling = false;
|
||||
}
|
||||
|
||||
JniWrapper.OnScroll(x, y, event.getEventTime());
|
||||
|
||||
}*/
|
||||
|
||||
|
||||
if (event.getAction() == MotionEvent.ACTION_UP)
|
||||
{
|
||||
float x = event.getX();
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -2,17 +2,31 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual C++ Express 2010
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DoubleHitBalls-win", "DoubleHitBalls-win\DoubleHitBalls-win.vcxproj", "{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20} = {48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Salmon Engine", "..\..\..\..\Engine\Salmon Engine\Salmon Engine.vcxproj", "{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug_nosound|Win32 = Debug_nosound|Win32
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{1CC98EEE-BBCB-4D79-B6D7-8511789172C5}.Release|Win32.Build.0 = Release|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.ActiveCfg = Debug_nosound|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.Build.0 = Debug_nosound|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -53,14 +53,15 @@
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TARGET_WIN32;TARGET_HALIBUT;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TARGET_WIN32;TARGET_SALMON;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(SolutionDir)\..\..\jni;</AdditionalIncludeDirectories>
|
||||
<DisableSpecificWarnings>4503</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>$(LibsPath)\boost_1_52_0\boost_windows\libs_engine\$(Configuration);$(LibsPath)\libogg-1.3.0\win32\VS2010\Win32\$(Configuration);$(LibsPath)\libvorbis-1.3.2\win32\VS2010\Win32\$(Configuration);$(LibsPath)\sqplus\lib;$(LibsPath)\DirectXsdk\Lib\x86;$(LibsPath)\lpng1510\projects\vstudio\Debug Library</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;Halibut Engine.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;libpng15.lib;dsound.lib;dxguid.lib;sqplusD.lib;squirrelD.lib;sqdbglibD.lib;sqstdlibD.lib</AdditionalDependencies>
|
||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;Salmon Engine.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;libpng15.lib;dsound.lib;dxguid.lib;sqplusD.lib;squirrelD.lib;sqdbglibD.lib;sqstdlibD.lib</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
@ -71,8 +72,9 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;TARGET_HALIBUT;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;TARGET_SALMON;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(SolutionDir)\..\..\jni;</AdditionalIncludeDirectories>
|
||||
<DisableSpecificWarnings>4503</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -80,7 +82,7 @@
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalLibraryDirectories>$(LibsPath)\boost_1_52_0\boost_windows\libs_engine\$(Configuration);$(LibsPath)\libogg-1.3.0\win32\VS2010\Win32\$(Configuration);$(LibsPath)\libvorbis-1.3.2\win32\VS2010\Win32\$(Configuration);$(LibsPath)\sqplus\lib;$(LibsPath)\DirectXsdk\Lib\x86;$(LibsPath)\lpng1510\projects\vstudio\Release Library</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;Halibut Engine.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;libpng15.lib;dsound.lib;dxguid.lib;sqplus.lib;squirrel.lib;sqdbglib.lib;sqstdlib.lib</AdditionalDependencies>
|
||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;Salmon Engine.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;zlib.lib;libpng15.lib;dsound.lib;dxguid.lib;sqplus.lib;squirrel.lib;sqdbglib.lib;sqstdlib.lib</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,113 +1,111 @@
|
||||
2012-Dec-10 00:12:14: Log started
|
||||
2012-Dec-10 00:12:18: OpenGL Window created
|
||||
2012-Dec-10 00:12:18: Script manager ready
|
||||
2012-Dec-10 00:12:20: Render::OpenGL glVersion = 4.0.10318 Compatibility Profile Context
|
||||
2012-Dec-10 00:12:20: Render::OpenGL glVersion above 2.0 ok
|
||||
2012-Dec-10 00:12:20: Render::OpenGL GL_ARB_framebuffer_object supported ok
|
||||
2012-Dec-10 00:12:20: Bind basic functions
|
||||
2012-Dec-10 00:12:20: APP INIT
|
||||
2013-Jan-27 20:57:26: Log started
|
||||
2013-Jan-27 20:57:32: OpenGL Window created
|
||||
2013-Jan-27 20:57:32: Script manager ready
|
||||
2013-Jan-27 20:57:32: Render::OpenGL glVersion = 4.0.10318 Compatibility Profile Context
|
||||
2013-Jan-27 20:57:32: Render::OpenGL glVersion above 2.0 ok
|
||||
2013-Jan-27 20:57:32: Render::OpenGL GL_ARB_framebuffer_object supported ok
|
||||
2013-Jan-27 20:57:32: Render::OpenGL GL_ARB_uniform_buffer_object supported ok
|
||||
2013-Jan-27 20:57:32: Bind basic functions
|
||||
2013-Jan-27 20:57:32: APP INIT
|
||||
|
||||
2012-Dec-10 00:12:20: Prepare to add shader TestShader
|
||||
2012-Dec-10 00:12:21: ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
2013-Jan-27 20:57:32: Prepare to add shader DefaultShader
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
|
||||
2012-Dec-10 00:12:22: ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
|
||||
2012-Dec-10 00:12:22: Shader program is - 3
|
||||
2012-Dec-10 00:12:22: ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
2013-Jan-27 20:57:33: Shader program is - 3
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage doesn't match between two stages
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage do
|
||||
2012-Dec-10 00:12:22: ResourceManager::ShaderManager shader loaded: TestShader
|
||||
2012-Dec-10 00:12:22: Prepare to add shader FrameShader
|
||||
2012-Dec-10 00:12:22: ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager shader loaded: DefaultShader
|
||||
2013-Jan-27 20:57:33: Prepare to add shader FrameShader
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
|
||||
2012-Dec-10 00:12:22: ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
|
||||
2012-Dec-10 00:12:22: Shader program is - 6
|
||||
2012-Dec-10 00:12:23: ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
2013-Jan-27 20:57:33: Shader program is - 6
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage doesn't match between two stages
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage do
|
||||
2012-Dec-10 00:12:23: ResourceManager::ShaderManager shader loaded: FrameShader
|
||||
2012-Dec-10 00:12:23: Prepare to add shader BrickShader
|
||||
2012-Dec-10 00:12:23: ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager shader loaded: FrameShader
|
||||
2013-Jan-27 20:57:33: Prepare to add shader BrickShader
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Vertex shader was successfully compiled to run on hardware.
|
||||
|
||||
2012-Dec-10 00:12:23: ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
2013-Jan-27 20:57:33: ResourceManager::ShaderManager::Shader Fragment shader was successfully compiled to run on hardware.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
|
||||
2012-Dec-10 00:12:23: Shader program is - 9
|
||||
2012-Dec-10 00:12:23: ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
2013-Jan-27 20:57:33: Shader program is - 9
|
||||
2013-Jan-27 20:57:34: ResourceManager::ShaderManager::Shader Fragment shader(s) linked, vertex shader(s) linked.
|
||||
WARNING: 0:1: warning(#260) Keyword 'precision' is supported in GLSL 1.3
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage doesn't match between two stages
|
||||
WARNING: warning(#276) Symbol 'texCoord' usage do
|
||||
2012-Dec-10 00:12:23: ResourceManager::ShaderManager shader loaded: BrickShader
|
||||
2012-Dec-10 00:12:24: ResourceManager::TexList Texture added: loading with id = 1
|
||||
2012-Dec-10 00:12:24: ResourceManager::TexList Texture added: logo_small with id = 2
|
||||
2012-Dec-10 00:12:24: ResourceManager::TexList Texture added: console_bkg.bmp with id = 3
|
||||
2012-Dec-10 00:12:24: FrameManager:: frame buffer added: LevelBuffer
|
||||
2012-Dec-10 00:12:24: Halibut Render OpenGL init
|
||||
2013-Jan-27 20:57:34: ResourceManager::ShaderManager shader loaded: BrickShader
|
||||
2013-Jan-27 20:57:34: ResourceManager::TexList Texture added: loading with id = 1
|
||||
2013-Jan-27 20:57:34: ResourceManager::TexList Texture added: logo_small with id = 2
|
||||
2013-Jan-27 20:57:34: ResourceManager::TexList Texture added: console_bkg.bmp with id = 3
|
||||
2013-Jan-27 20:57:34: FrameManager:: frame buffer added: LevelBuffer
|
||||
2013-Jan-27 20:57:37: ResourceManager::TexList Texture added: droid_sans14_font_bitmap.png with id = 5
|
||||
2013-Jan-27 20:57:38: ResourceManager::TexList Texture added: main_menu_bkg_left with id = 6
|
||||
2013-Jan-27 20:57:38: ResourceManager::TexList Texture added: main_menu_bkg_right with id = 7
|
||||
2013-Jan-27 20:57:38: ResourceManager::TexList Texture added: select_level with id = 8
|
||||
2013-Jan-27 20:57:40: ResourceManager::TexList Texture added: shutterstock1 with id = 9
|
||||
2013-Jan-27 20:57:41: ResourceManager::TexList Texture added: shutterstock2 with id = 10
|
||||
2013-Jan-27 20:57:42: ResourceManager::TexList Texture added: shutterstock3 with id = 11
|
||||
2013-Jan-27 20:57:43: ResourceManager::TexList Texture added: shutterstock4 with id = 12
|
||||
2013-Jan-27 20:57:45: ResourceManager::TexList Texture added: shutterstock5 with id = 13
|
||||
2013-Jan-27 20:57:46: ResourceManager::TexList Texture added: shutterstock6 with id = 14
|
||||
2013-Jan-27 20:57:46: ResourceManager::TexList Texture added: shutterstock7 with id = 15
|
||||
2013-Jan-27 20:57:47: ResourceManager::TexList Texture added: shutterstock8 with id = 16
|
||||
2013-Jan-27 20:57:47: ResourceManager::TexList Texture added: shutterstock9 with id = 17
|
||||
2013-Jan-27 20:57:47: ResourceManager::TexList Texture added: shutterstock10 with id = 18
|
||||
2013-Jan-27 20:57:48: ResourceManager::TexList Texture added: shutterstock11 with id = 19
|
||||
2013-Jan-27 20:57:48: ResourceManager::TexList Texture added: shutterstock12 with id = 20
|
||||
2013-Jan-27 20:57:48: ResourceManager::TexList Texture added: levelshot1 with id = 21
|
||||
2013-Jan-27 20:57:48: ResourceManager::TexList Texture added: levelshot2 with id = 22
|
||||
2013-Jan-27 20:57:49: ResourceManager::TexList Texture added: levelshot3 with id = 23
|
||||
2013-Jan-27 20:57:49: ResourceManager::TexList Texture added: levelshot4 with id = 24
|
||||
2013-Jan-27 20:57:49: ResourceManager::TexList Texture added: levelshot5 with id = 25
|
||||
2013-Jan-27 20:57:49: ResourceManager::TexList Texture added: levelshot6 with id = 26
|
||||
2013-Jan-27 20:57:49: ResourceManager::TexList Texture added: levelshot7 with id = 27
|
||||
2013-Jan-27 20:57:49: ResourceManager::TexList Texture added: levelshot8 with id = 28
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: levelshot9 with id = 29
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: levelshot10 with id = 30
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: levelshot11 with id = 31
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: levelshot12 with id = 32
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: game_end with id = 33
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: block1 with id = 34
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: block2 with id = 35
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: block3 with id = 36
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: bonus_gothrough with id = 37
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: bonus_multiplier with id = 38
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: bonus_floor with id = 39
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: ball with id = 40
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: ball_glow with id = 41
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: wall_left with id = 42
|
||||
2013-Jan-27 20:57:50: ResourceManager::TexList Texture added: wall_right with id = 43
|
||||
2013-Jan-27 20:57:51: ResourceManager::TexList Texture added: wall_up with id = 44
|
||||
2013-Jan-27 20:57:51: ResourceManager::TexList Texture added: wall_bonus with id = 45
|
||||
2013-Jan-27 20:57:51: ResourceManager::TexList Texture added: reflector with id = 46
|
||||
2013-Jan-27 20:57:51: ResourceManager::TexList Texture added: back_btn with id = 47
|
||||
2013-Jan-27 20:57:51: ResourceManager::TexList Texture added: slide_up_btn with id = 48
|
||||
2013-Jan-27 20:57:51: ResourceManager::TexList Texture added: tap_to_continue_btn with id = 49
|
||||
2013-Jan-27 20:57:51: ResourceManager::TexList Texture added: credits with id = 50
|
||||
2013-Jan-27 20:58:07: Program prepares to quit
|
||||
2013-Jan-27 20:58:07: APP DEINIT
|
||||
|
||||
2012-Dec-10 00:12:25: ResourceManager::TexList Texture added: droid_sans14_font_bitmap.png with id = 5
|
||||
2012-Dec-10 00:12:26: ResourceManager::TexList Texture added: main_menu_bkg_left with id = 6
|
||||
2012-Dec-10 00:12:27: ResourceManager::TexList Texture added: main_menu_bkg_right with id = 7
|
||||
2012-Dec-10 00:12:27: ResourceManager::TexList Texture added: select_level with id = 8
|
||||
2012-Dec-10 00:12:27: ResourceManager::TexList Texture added: shutterstock1 with id = 9
|
||||
2012-Dec-10 00:12:29: ResourceManager::TexList Texture added: shutterstock2 with id = 10
|
||||
2012-Dec-10 00:12:29: ResourceManager::TexList Texture added: shutterstock3 with id = 11
|
||||
2012-Dec-10 00:12:30: ResourceManager::TexList Texture added: shutterstock4 with id = 12
|
||||
2012-Dec-10 00:12:31: ResourceManager::TexList Texture added: shutterstock5 with id = 13
|
||||
2012-Dec-10 00:12:31: ResourceManager::TexList Texture added: shutterstock6 with id = 14
|
||||
2012-Dec-10 00:12:32: ResourceManager::TexList Texture added: shutterstock7 with id = 15
|
||||
2012-Dec-10 00:12:32: ResourceManager::TexList Texture added: shutterstock8 with id = 16
|
||||
2012-Dec-10 00:12:33: ResourceManager::TexList Texture added: shutterstock9 with id = 17
|
||||
2012-Dec-10 00:12:33: ResourceManager::TexList Texture added: shutterstock10 with id = 18
|
||||
2012-Dec-10 00:12:34: ResourceManager::TexList Texture added: shutterstock11 with id = 19
|
||||
2012-Dec-10 00:12:35: ResourceManager::TexList Texture added: shutterstock12 with id = 20
|
||||
2012-Dec-10 00:12:35: ResourceManager::TexList Texture added: levelshot1 with id = 21
|
||||
2012-Dec-10 00:12:35: ResourceManager::TexList Texture added: levelshot2 with id = 22
|
||||
2012-Dec-10 00:12:36: ResourceManager::TexList Texture added: levelshot3 with id = 23
|
||||
2012-Dec-10 00:12:36: ResourceManager::TexList Texture added: levelshot4 with id = 24
|
||||
2012-Dec-10 00:12:36: ResourceManager::TexList Texture added: levelshot5 with id = 25
|
||||
2012-Dec-10 00:12:37: ResourceManager::TexList Texture added: levelshot6 with id = 26
|
||||
2012-Dec-10 00:12:37: ResourceManager::TexList Texture added: levelshot7 with id = 27
|
||||
2012-Dec-10 00:12:38: ResourceManager::TexList Texture added: levelshot8 with id = 28
|
||||
2012-Dec-10 00:12:38: ResourceManager::TexList Texture added: levelshot9 with id = 29
|
||||
2012-Dec-10 00:12:38: ResourceManager::TexList Texture added: levelshot10 with id = 30
|
||||
2012-Dec-10 00:12:38: ResourceManager::TexList Texture added: levelshot11 with id = 31
|
||||
2012-Dec-10 00:12:38: ResourceManager::TexList Texture added: levelshot12 with id = 32
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: game_end with id = 33
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: block1 with id = 34
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: block2 with id = 35
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: block3 with id = 36
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: bonus_gothrough with id = 37
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: bonus_multiplier with id = 38
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: bonus_floor with id = 39
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: ball with id = 40
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: ball_glow with id = 41
|
||||
2012-Dec-10 00:12:39: ResourceManager::TexList Texture added: wall_left with id = 42
|
||||
2012-Dec-10 00:12:40: ResourceManager::TexList Texture added: wall_right with id = 43
|
||||
2012-Dec-10 00:12:40: ResourceManager::TexList Texture added: wall_up with id = 44
|
||||
2012-Dec-10 00:12:40: ResourceManager::TexList Texture added: wall_bonus with id = 45
|
||||
2012-Dec-10 00:12:40: ResourceManager::TexList Texture added: reflector with id = 46
|
||||
2012-Dec-10 00:12:40: ResourceManager::TexList Texture added: back_btn with id = 47
|
||||
2012-Dec-10 00:12:40: ResourceManager::TexList Texture added: slide_up_btn with id = 48
|
||||
2012-Dec-10 00:12:41: ResourceManager::TexList Texture added: tap_to_continue_btn with id = 49
|
||||
2012-Dec-10 00:12:41: ResourceManager::TexList Texture added: credits with id = 50
|
||||
2012-Dec-10 00:13:19: Program prepares to quit
|
||||
2012-Dec-10 00:13:19: APP DEINIT
|
||||
|
||||
2012-Dec-10 00:13:19: HalibutAnimationManager deleting...
|
||||
2012-Dec-10 00:13:19: TFontManager deleting...
|
||||
2012-Dec-10 00:13:19: ResourceManager::FrameManager deleting
|
||||
2012-Dec-10 00:13:19: GUI Manager deleting...
|
||||
2012-Dec-10 00:13:20: Script manager shutdown
|
||||
2012-Dec-10 00:13:20: ResourceManager::ShaderManager::Shader deleting
|
||||
2012-Dec-10 00:13:20: ResourceManager::ShaderManager::Shader deleting
|
||||
2012-Dec-10 00:13:20: ResourceManager::ShaderManager::Shader deleting
|
||||
2012-Dec-10 00:13:20: ResourceManager::ShaderManager cleared
|
||||
2012-Dec-10 00:13:20: ResourceManager::ShaderManager deleting
|
||||
2012-Dec-10 00:13:20: ResourceManager::TexList cleared
|
||||
2012-Dec-10 00:13:20: ResourceManager::TexList deleting
|
||||
2012-Dec-10 00:13:20: HalibutRender::deleting
|
||||
2013-Jan-27 20:58:07: GUI Manager deleting...
|
||||
2013-Jan-27 20:58:07: TFontManager deleting...
|
||||
2013-Jan-27 20:58:07: Script manager shutdown
|
||||
2013-Jan-27 20:58:07: ResourceManager::FrameManager deleting
|
||||
2013-Jan-27 20:58:07: ResourceManager::ShaderManager::Shader deleting
|
||||
2013-Jan-27 20:58:08: ResourceManager::ShaderManager::Shader deleting
|
||||
2013-Jan-27 20:58:08: ResourceManager::ShaderManager::Shader deleting
|
||||
2013-Jan-27 20:58:08: ResourceManager::ShaderManager cleared
|
||||
2013-Jan-27 20:58:08: ResourceManager::ShaderManager deleting
|
||||
2013-Jan-27 20:58:08: ResourceManager::ModelManager deleting
|
||||
2013-Jan-27 20:58:08: ResourceManager::TexList cleared
|
||||
2013-Jan-27 20:58:08: ResourceManager::TexList deleting
|
||||
|
||||
Loading…
Reference in New Issue
Block a user