mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-21 06:19:56 +00:00
sprite.cpp cleanup
This commit is contained in:
parent
bfd7ba4388
commit
0ef68d8ad3
4 changed files with 6 additions and 12 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.28.3)
|
cmake_minimum_required(VERSION 3.28.3)
|
||||||
project(sunshine)
|
project(oneshot)
|
||||||
## Setup options ##
|
## Setup options ##
|
||||||
set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
|
set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
|
||||||
set(VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION "5.1.2600.0")
|
set(VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION "5.1.2600.0")
|
||||||
|
|
@ -7,7 +7,7 @@ include(FindPackageHandleStandardArgs)
|
||||||
|
|
||||||
option(STEAM "Build for Steam" OFF)
|
option(STEAM "Build for Steam" OFF)
|
||||||
set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
|
set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
|
||||||
option(DEBUG "Debug mode" ON)
|
option(DEBUG "Debug mode" OFF)
|
||||||
#For paranoicws:3
|
#For paranoicws:3
|
||||||
option(EXTRA_SECURITY "Extra security" OFF)
|
option(EXTRA_SECURITY "Extra security" OFF)
|
||||||
set(ZLIB_USE_STATIC_LIBS ON)
|
set(ZLIB_USE_STATIC_LIBS ON)
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "gl-debug.h"
|
#include "gl-debug.h"
|
||||||
#include "gl-fun.h"
|
#include "gl-fun.h"
|
||||||
|
#include "debugwriter.h"
|
||||||
#include <SDL3/SDL_stdinc.h>
|
#include <SDL3/SDL_stdinc.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
// https://github.com/moby/profiles/blob/main/seccomp/default.json
|
// https://github.com/moby/profiles/blob/main/seccomp/default.json
|
||||||
#include "security.h"
|
#include "security.h"
|
||||||
#include "meow.h"
|
#include "meow.h"
|
||||||
|
#include "debugwriter.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
|
@ -11,7 +12,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void SecurityManagerInit(){
|
void SecurityManagerInit(){
|
||||||
log("Initializing SecurityEngine", 3);
|
Debug() << "Initializing SecurityEngine";
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
printf("[SECURITY] initializing SECCOMP filter...\n");
|
printf("[SECURITY] initializing SECCOMP filter...\n");
|
||||||
ctx = seccomp_init(SCMP_ACT_ALLOW); // Default action: Kill the process
|
ctx = seccomp_init(SCMP_ACT_ALLOW); // Default action: Kill the process
|
||||||
|
|
|
||||||
|
|
@ -360,11 +360,6 @@ void Sprite::setY(int value){
|
||||||
return;
|
return;
|
||||||
|
|
||||||
p->trans.setPosition(Vec2(getX(), value));
|
p->trans.setPosition(Vec2(getX(), value));
|
||||||
|
|
||||||
if (rgssVer >= 2){
|
|
||||||
p->wave.dirty = true;
|
|
||||||
setSpriteY(value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sprite::setOX(int value){
|
void Sprite::setOX(int value){
|
||||||
|
|
@ -402,9 +397,6 @@ void Sprite::setZoomY(float value){
|
||||||
|
|
||||||
p->trans.setScale(Vec2(getZoomX(), value));
|
p->trans.setScale(Vec2(getZoomX(), value));
|
||||||
p->recomputeBushDepth();
|
p->recomputeBushDepth();
|
||||||
|
|
||||||
if (rgssVer >= 2)
|
|
||||||
p->wave.dirty = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sprite::setAngle(float value){
|
void Sprite::setAngle(float value){
|
||||||
|
|
@ -628,4 +620,4 @@ void Sprite::defaultSpriteShaderInit(SpriteShaderBase &shader){
|
||||||
|
|
||||||
shader.setColor(*blend);
|
shader.setColor(*blend);
|
||||||
shader.setModulate(p->modulate->norm);
|
shader.setModulate(p->modulate->norm);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue