This commit is contained in:
parent
f53e09f331
commit
f3232ef324
|
|
@ -22,6 +22,7 @@
|
||||||
# Donators:
|
# Donators:
|
||||||
| Donator |
|
| Donator |
|
||||||
| ----------- |
|
| ----------- |
|
||||||
|
| The name sold |
|
||||||
| Kodu |
|
| Kodu |
|
||||||
|
|
||||||
## Special thanks to
|
## Special thanks to
|
||||||
|
|
|
||||||
|
|
@ -57,4 +57,6 @@ Added In-Memory Log buffer
|
||||||
Added setting "Use Old Self Contained Universe(Reprise) version"
|
Added setting "Use Old Self Contained Universe(Reprise) version"
|
||||||
Rewrited audio system from SDL3_sound and OpenAL to SDL_mixer
|
Rewrited audio system from SDL3_sound and OpenAL to SDL_mixer
|
||||||
Added Master Volume setting
|
Added Master Volume setting
|
||||||
Added viewports scaling
|
Added viewports scaling
|
||||||
|
Build script for Windows MinGW
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -185,9 +185,9 @@ void crash_screen(SDL_Window* win){
|
||||||
const static int sdlcompiled = SDL_VERSION;
|
const static int sdlcompiled = SDL_VERSION;
|
||||||
const static int sdllinked = SDL_GetVersion();
|
const static int sdllinked = SDL_GetVersion();
|
||||||
o << "SDL(compiled) version: " << SDL_VERSIONNUM_MAJOR(sdlcompiled) << "." << SDL_VERSIONNUM_MINOR(sdlcompiled) << "." << SDL_VERSIONNUM_MICRO(sdlcompiled) << endl;
|
o << "SDL(compiled) version: " << SDL_VERSIONNUM_MAJOR(sdlcompiled) << "." << SDL_VERSIONNUM_MINOR(sdlcompiled) << "." << SDL_VERSIONNUM_MICRO(sdlcompiled) << endl;
|
||||||
o << "SDL(linked) version: " << SDL_VERSIONNUM_MAJOR(sdllinked) << "." << SDL_VERSIONNUM_MINOR(sdllinked) << "." << SDL_VERSIONNUM_MICRO(sdllinked) << endl;
|
|
||||||
o << "SDL_image(compiled) version: " << SDL_IMAGE_MAJOR_VERSION << "." << SDL_IMAGE_MINOR_VERSION << "." << SDL_IMAGE_MICRO_VERSION << endl;
|
o << "SDL_image(compiled) version: " << SDL_IMAGE_MAJOR_VERSION << "." << SDL_IMAGE_MINOR_VERSION << "." << SDL_IMAGE_MICRO_VERSION << endl;
|
||||||
o << "SDL_TTF(compiled) version: " << SDL_TTF_MAJOR_VERSION << "." << SDL_TTF_MINOR_VERSION << "." << SDL_TTF_MICRO_VERSION << endl;
|
o << "SDL_TTF(compiled) version: " << SDL_TTF_MAJOR_VERSION << "." << SDL_TTF_MINOR_VERSION << "." << SDL_TTF_MICRO_VERSION << endl;
|
||||||
|
0 << "SDL_mixer version: " << MIX_Version() << endl;
|
||||||
o << "Ruby version: " << RUBY_API_VERSION_CODE << endl;
|
o << "Ruby version: " << RUBY_API_VERSION_CODE << endl;
|
||||||
o << "ZLib version: " << ZLIB_VERSION << endl;
|
o << "ZLib version: " << ZLIB_VERSION << endl;
|
||||||
o << "Boost versino: " << BOOST_VERSION / 100000 << "." << BOOST_VERSION / 100 % 1000 << "." << BOOST_VERSION % 100 << endl;
|
o << "Boost versino: " << BOOST_VERSION / 100000 << "." << BOOST_VERSION / 100 % 1000 << "." << BOOST_VERSION % 100 << endl;
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ void Shader::init(const unsigned char *vert, int vertSize, const unsigned char *
|
||||||
|
|
||||||
if (!success){
|
if (!success){
|
||||||
printShaderLog(vertShader);
|
printShaderLog(vertShader);
|
||||||
crash(Exception::ShaderError, "GLSL: An error occured while compiling vertex shader '%s' in program '%s'", vertName, programName);
|
ErrorMsg(Exception::ShaderError, "GLSL: An error occured while compiling vertex shader '%s' in program '%s'", vertName, programName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compile fragment shader */
|
/* Compile fragment shader */
|
||||||
|
|
@ -164,7 +164,7 @@ void Shader::init(const unsigned char *vert, int vertSize, const unsigned char *
|
||||||
|
|
||||||
if (!success){
|
if (!success){
|
||||||
printShaderLog(fragShader);
|
printShaderLog(fragShader);
|
||||||
crash(Exception::ShaderError, "GLSL: An error occured while compiling fragment shader '%s' in program '%s'", fragName, programName);
|
ErrorMsg(Exception::ShaderError, "GLSL: An error occured while compiling fragment shader '%s' in program '%s'", fragName, programName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Link shader program */
|
/* Link shader program */
|
||||||
|
|
@ -181,7 +181,7 @@ void Shader::init(const unsigned char *vert, int vertSize, const unsigned char *
|
||||||
|
|
||||||
if (!success){
|
if (!success){
|
||||||
printProgramLog(program);
|
printProgramLog(program);
|
||||||
crash(Exception::ShaderError, "GLSL: An error occured while linking program '%s' (vertex '%s', fragment '%s')", programName, vertName, fragName);
|
ErrorMsg(Exception::ShaderError, "GLSL: An error occured while linking program '%s' (vertex '%s', fragment '%s')", programName, vertName, fragName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue