mirror of
https://github.com/halpz/re3.git
synced 2025-07-25 01:29:47 +00:00
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # premake5.lua # src/animation/AnimManager.cpp # src/animation/AnimationId.h # src/audio/MusicManager.cpp # src/audio/audio_enums.h # src/control/Script7.cpp # src/core/FileLoader.cpp # src/core/re3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/postfx.cpp # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_PS.hlsl # src/extras/shaders/make_hlsl.cmd # src/extras/shaders/obj/colourfilterVC_PS.cso # src/extras/shaders/obj/colourfilterVC_PS.inc # src/extras/shaders/obj/colourfilterVC_frag.inc # src/peds/PedFight.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Particle.cpp # src/render/WaterCannon.cpp # src/skel/win/gtavc.ico # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt
This commit is contained in:
@ -950,6 +950,43 @@ RtBMPImageRead(const RwChar *imageName)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
RwImage *
|
||||
RtPNGImageWrite(RwImage *image, const RwChar *imageName)
|
||||
{
|
||||
#ifndef _WIN32
|
||||
char *r = casepath(imageName);
|
||||
if (r) {
|
||||
rw::writePNG(image, r);
|
||||
free(r);
|
||||
} else {
|
||||
rw::writePNG(image, imageName);
|
||||
}
|
||||
|
||||
#else
|
||||
rw::writePNG(image, imageName);
|
||||
#endif
|
||||
return image;
|
||||
}
|
||||
RwImage *
|
||||
RtPNGImageRead(const RwChar *imageName)
|
||||
{
|
||||
#ifndef _WIN32
|
||||
RwImage *image;
|
||||
char *r = casepath(imageName);
|
||||
if (r) {
|
||||
image = rw::readPNG(r);
|
||||
free(r);
|
||||
} else {
|
||||
image = rw::readPNG(imageName);
|
||||
}
|
||||
return image;
|
||||
|
||||
#else
|
||||
return rw::readPNG(imageName);
|
||||
#endif
|
||||
}
|
||||
|
||||
#include "rtquat.h"
|
||||
|
||||
RtQuat *RtQuatRotate(RtQuat * quat, const RwV3d * axis, RwReal angle, RwOpCombineType combineOp) { return (RtQuat*)((rw::Quat*)quat)->rotate(axis, angle/180.0f*3.14159f, (CombineOp)combineOp); }
|
||||
|
4
src/fakerw/rtpng.h
Normal file
4
src/fakerw/rtpng.h
Normal file
@ -0,0 +1,4 @@
|
||||
#pragma once
|
||||
|
||||
RwImage *RtPNGImageWrite(RwImage * image, const RwChar * imageName);
|
||||
RwImage *RtPNGImageRead(const RwChar * imageName);
|
Reference in New Issue
Block a user