mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-22 23:06:18 +00:00
Глупенькие изменения гояью
This commit is contained in:
parent
8804b317c6
commit
ee3e60581c
6 changed files with 7 additions and 18 deletions
|
|
@ -1072,6 +1072,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align){
|
||||||
|
|
||||||
shState->bindTex();
|
shState->bindTex();
|
||||||
TEX::uploadSubImage(0, 0, txtSurf->w, txtSurf->h, txtSurf->pixels, GL_RGBA);
|
TEX::uploadSubImage(0, 0, txtSurf->w, txtSurf->h, txtSurf->pixels, GL_RGBA);
|
||||||
|
//TODO: настройка в зависимости от oneshot.conf
|
||||||
TEX::setSmooth(true);
|
TEX::setSmooth(true);
|
||||||
|
|
||||||
Quad &quad = shState->gpQuad();
|
Quad &quad = shState->gpQuad();
|
||||||
|
|
@ -1142,7 +1143,6 @@ IntRect Bitmap::textSize(const char *str){
|
||||||
|
|
||||||
// i don't know if its right migration, i didn't find any other way
|
// i don't know if its right migration, i didn't find any other way
|
||||||
TTF_Text* text = TTF_CreateText(NULL, font, str, strlen(str));
|
TTF_Text* text = TTF_CreateText(NULL, font, str, strlen(str));
|
||||||
|
|
||||||
int w, h;
|
int w, h;
|
||||||
TTF_GetTextSize(text, &w, &h);
|
TTF_GetTextSize(text, &w, &h);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,6 @@
|
||||||
#include "serial-util.h"
|
#include "serial-util.h"
|
||||||
#include "exception.h"
|
#include "exception.h"
|
||||||
#include "meow.h"
|
#include "meow.h"
|
||||||
|
|
||||||
// this file doesn't exist, idk what to do if it, so i'll comment it.
|
|
||||||
// #include <SDL3/SDL_types.h>
|
|
||||||
#include <SDL3/SDL_pixels.h>
|
#include <SDL3/SDL_pixels.h>
|
||||||
|
|
||||||
Color::Color(double red, double green, double blue, double alpha)
|
Color::Color(double red, double green, double blue, double alpha)
|
||||||
|
|
|
||||||
|
|
@ -247,11 +247,6 @@ static void initReadOps(PHYSFS_File *handle, SDL_IOStream* &ops){
|
||||||
iface.read = SDL_RWopsRead;
|
iface.read = SDL_RWopsRead;
|
||||||
iface.write = SDL_RWopsWrite;
|
iface.write = SDL_RWopsWrite;
|
||||||
|
|
||||||
/* useless now :P
|
|
||||||
if (freeOnClose)
|
|
||||||
ops.close = SDL_RWopsCloseFree;
|
|
||||||
else */
|
|
||||||
|
|
||||||
iface.flush = SDL_RWopsFlush;
|
iface.flush = SDL_RWopsFlush;
|
||||||
iface.close = SDL_RWopsClose;
|
iface.close = SDL_RWopsClose;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ struct GLDebugLoggerPrivate{
|
||||||
|
|
||||||
void writeTimestamp(){
|
void writeTimestamp(){
|
||||||
time(×tamp);
|
time(×tamp);
|
||||||
*stream << "[GLDEBUG " << ctime(×tamp) << "]";
|
*stream << "[GLDEBUG] [" << ctime(×tamp) << "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
void writeLine(const char *line){
|
void writeLine(const char *line){
|
||||||
|
|
|
||||||
|
|
@ -82,8 +82,7 @@ struct PlanePrivate{
|
||||||
shader(ShaderType::SHADER_plane)
|
shader(ShaderType::SHADER_plane)
|
||||||
{
|
{
|
||||||
updateSrcRectCon();
|
updateSrcRectCon();
|
||||||
prepareCon = shState->prepareDraw.connect
|
prepareCon = shState->prepareDraw.connect(sigc::mem_fun(this, &PlanePrivate::prepare));
|
||||||
(sigc::mem_fun(this, &PlanePrivate::prepare));
|
|
||||||
|
|
||||||
qArray.resize(1);
|
qArray.resize(1);
|
||||||
}
|
}
|
||||||
|
|
@ -101,8 +100,7 @@ struct PlanePrivate{
|
||||||
/* Cut old connection */
|
/* Cut old connection */
|
||||||
srcRectCon.disconnect();
|
srcRectCon.disconnect();
|
||||||
/* Create new one */
|
/* Create new one */
|
||||||
srcRectCon = srcRect->valueChanged.connect
|
srcRectCon = srcRect->valueChanged.connect(sigc::mem_fun(this, &PlanePrivate::onSrcRectChange));
|
||||||
(sigc::mem_fun(this, &PlanePrivate::onSrcRectChange));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void updateQuadSource(){
|
void updateQuadSource(){
|
||||||
|
|
|
||||||
|
|
@ -114,8 +114,7 @@ struct SpritePrivate{
|
||||||
|
|
||||||
updateSrcRectCon();
|
updateSrcRectCon();
|
||||||
|
|
||||||
prepareCon = shState->prepareDraw.connect
|
prepareCon = shState->prepareDraw.connect(sigc::mem_fun(this, &SpritePrivate::prepare));
|
||||||
(sigc::mem_fun(this, &SpritePrivate::prepare));
|
|
||||||
|
|
||||||
wave.amp = 0;
|
wave.amp = 0;
|
||||||
wave.length = 180;
|
wave.length = 180;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue