← Back to branch summary

~ubuntu-branches/ubuntu/trusty/rlvm/trusty

~ubuntu-branches/ubuntu/trusty/rlvm/trusty

« back to all changes in this revision

Viewing changes to src/Systems/SDL/Texture.hpp

Committer: Package Import Robot
Author(s): Ying-Chun Liu (PaulLiu)
Date: 2013-11-02 02:57:13 UTC
mfrom: (10.1.3 sid)
Revision ID: package-import@ubuntu.com-20131102025713-yzg31grxr8i7xerh

Tags: 0.13-1

* New upstream release
  - rlvm will now warn on startup when it detects Japanese save data, but
    English patched game files, and offer to reset the save data.
  - Much better support for Little Busters. Most graphical glitches during
    the Little Busters Refrain have been fixed.
  - TCC tone curve effects have been reverse-engineered and implemented
    (thanks to lurkmoar)
  - Sepia scenes (and other graphical filters) should look much better.
  - Simple shake commands implemented (fancy per-layer shaking still
    unimplemented).
  - Make animations smooth: data should be uploaded to the graphics card
    before an animation loop starts, not while the animation loop is
    running.
  - Fixes finding system fonts on Linux
  - Thanks to Elliot Glaysher <glaysher@umich.edu>
* Remove upstreamed patches:
  - debian/patches/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch
  - debian/patches/003_5dafabf5448635c4d4526d6e35ea7ec664a27261.patch
  - debian/patches/004_boost-drop-mt.patch
  - debian/patches/005_missing-include.patch

files added:
src/LongOperations/ButtonObjectSelectLongOperation.cpp

src/LongOperations/ButtonObjectSelectLongOperation.hpp

src/MachineBase/DumpScenario.cpp

src/MachineBase/DumpScenario.hpp

src/Modules/Module_G00.cpp

src/Modules/Module_G00.hpp

src/Modules/Module_ObjGetters.cpp

src/Modules/Module_ObjGetters.hpp

src/Modules/Module_Sys_timetable2.cpp

src/Modules/Module_Sys_timetable2.hpp

src/Modules/ObjectMutatorOperations.cpp

src/Modules/ObjectMutatorOperations.hpp

src/Systems/Base/ColourFilter.hpp

src/Systems/Base/HIKRenderer.cpp

src/Systems/Base/HIKRenderer.hpp

src/Systems/Base/LittleBustersPT00DLL.cpp

src/Systems/Base/LittleBustersPT00DLL.hpp

src/Systems/Base/ObjectMutator.cpp

src/Systems/Base/ObjectMutator.hpp

src/Systems/Base/TomoyoAfterDT00DLL.cpp

src/Systems/Base/TomoyoAfterDT00DLL.hpp

src/Systems/Base/ToneCurve.cpp

src/Systems/Base/ToneCurve.hpp

src/Systems/SDL/SDLColourFilter.cpp

src/Systems/SDL/SDLColourFilter.hpp

src/Systems/SDL/Shaders.cpp

src/Systems/SDL/Shaders.hpp

src/Systems/SDL/object.frag

src/Utilities/math_util.cpp

src/Utilities/math_util.hpp

test/TestSystem/MockColourFilter.hpp

test/rect_test.cpp

files removed:
.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/SConstruct

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/MachineBase

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/MachineBase/RLVMInstance.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/MachineBase/SerializationGlobal.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Modules

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Modules/Module_Sys_Save.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/Base

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/Base/GraphicsSystem.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/Base/KOEPACVoiceArchive.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/Base/NWKVoiceArchive.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/Base/OVKVoiceSample.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/Base/System.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/Base/VoiceCache.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/SDL

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/SDL/SDLGraphicsSystem.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/SDL/SDLMusic.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/SDL/SDLSoundChunk.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Systems/SDL/SDLTextSystem.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Utilities

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/Utilities/File.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/libReallive

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/src/libReallive/archive.cpp

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/vendor

.pc/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch/vendor/wxInclude.cpp

.pc/003_5dafabf5448635c4d4526d6e35ea7ec664a27261.patch

.pc/003_5dafabf5448635c4d4526d6e35ea7ec664a27261.patch/src

.pc/003_5dafabf5448635c4d4526d6e35ea7ec664a27261.patch/src/MachineBase

.pc/003_5dafabf5448635c4d4526d6e35ea7ec664a27261.patch/src/MachineBase/RLVMInstance.cpp

.pc/004_boost-drop-mt.patch

.pc/004_boost-drop-mt.patch/SConstruct

.pc/005_missing-include.patch

.pc/005_missing-include.patch/src

.pc/005_missing-include.patch/src/Systems

.pc/005_missing-include.patch/src/Systems/Base

.pc/005_missing-include.patch/src/Systems/Base/TextPage.hpp

debian/patches/002_675426ad62bccf1de10b0ae31dd46331ec47aacb.patch

debian/patches/003_5dafabf5448635c4d4526d6e35ea7ec664a27261.patch

debian/patches/004_boost-drop-mt.patch

debian/patches/005_missing-include.patch

src/Modules/Module_ObjPosDims.cpp

src/Modules/Module_ObjPosDims.hpp

vendor/xclannad/file_impl.h

files modified:
.pc/001_Use_system_library.patch/SConstruct

.pc/applied-patches

NEWS.TXT

README.TXT

SConscript

SConscript.test

SConstruct

debian/changelog

debian/patches/001_Use_system_library.patch

debian/patches/series

src/Effects/EffectFactory.cpp

src/LongOperations/SelectLongOperation.cpp

src/LongOperations/SelectLongOperation.hpp

src/LongOperations/WaitLongOperation.cpp

src/LongOperations/WaitLongOperation.hpp

src/MachineBase/GeneralOperations.cpp

src/MachineBase/GeneralOperations.hpp

src/MachineBase/RLMachine.cpp

src/MachineBase/RLMachine.hpp

src/MachineBase/RLModule.cpp

src/MachineBase/RLModule.hpp

src/MachineBase/RLOperation.cpp

src/MachineBase/RLOperation/Special_T.hpp

src/MachineBase/RLVMInstance.cpp

src/MachineBase/RLVMInstance.hpp

src/MachineBase/RealLiveDLL.cpp

src/Modules/Module_Bgm.cpp

src/Modules/Module_Bgr.cpp

src/Modules/Module_Gan.cpp

src/Modules/Module_Grp.cpp

src/Modules/Module_Jmp.cpp

src/Modules/Module_Koe.cpp

src/Modules/Module_Msg.cpp

src/Modules/Module_Obj.cpp

src/Modules/Module_Obj.hpp

src/Modules/Module_ObjCreation.cpp

src/Modules/Module_ObjFgBg.cpp

src/Modules/Module_ObjFgBg.hpp

src/Modules/Module_ObjManagement.cpp

src/Modules/Module_Pcm.cpp

src/Modules/Module_Sel.cpp

src/Modules/Module_Sys.cpp

src/Modules/Module_Sys_Save.cpp

src/Modules/Module_Sys_Timer.cpp

src/Modules/Module_Sys_Wait.cpp

src/Modules/Module_Sys_index_series.cpp

src/Modules/Module_Sys_index_series.hpp

src/Modules/Modules.cpp

src/Platforms/gcn/GCNGraphics.hpp

src/Platforms/gtk/GtkRLVMInstance.cpp

src/Platforms/gtk/GtkRLVMInstance.hpp

src/Platforms/gtk/rlvm.cpp

src/Platforms/osx/CocoaRLVMInstance.h

src/Platforms/osx/CocoaRLVMInstance.mm

src/Platforms/osx/Info.plist.in

src/Systems/Base/AnmGraphicsObjectData.cpp

src/Systems/Base/AnmGraphicsObjectData.hpp

src/Systems/Base/Colour.cpp

src/Systems/Base/Colour.hpp

src/Systems/Base/ColourFilterObjectData.cpp

src/Systems/Base/ColourFilterObjectData.hpp

src/Systems/Base/DigitsGraphicsObject.cpp

src/Systems/Base/DigitsGraphicsObject.hpp

src/Systems/Base/DriftGraphicsObject.cpp

src/Systems/Base/DriftGraphicsObject.hpp

src/Systems/Base/GanGraphicsObjectData.cpp

src/Systems/Base/GanGraphicsObjectData.hpp

src/Systems/Base/GraphicsObject.cpp

src/Systems/Base/GraphicsObject.hpp

src/Systems/Base/GraphicsObjectData.cpp

src/Systems/Base/GraphicsObjectData.hpp

src/Systems/Base/GraphicsObjectOfFile.cpp

src/Systems/Base/GraphicsObjectOfFile.hpp

src/Systems/Base/GraphicsSystem.cpp

src/Systems/Base/GraphicsSystem.hpp

src/Systems/Base/GraphicsTextObject.cpp

src/Systems/Base/GraphicsTextObject.hpp

src/Systems/Base/HIKScript.cpp

src/Systems/Base/HIKScript.hpp

src/Systems/Base/MouseCursor.cpp

src/Systems/Base/MouseCursor.hpp

src/Systems/Base/ParentGraphicsObjectData.cpp

src/Systems/Base/ParentGraphicsObjectData.hpp

src/Systems/Base/Rect.cpp

src/Systems/Base/Rect.hpp

src/Systems/Base/SelectionElement.cpp

src/Systems/Base/SelectionElement.hpp

src/Systems/Base/SoundSystem.hpp

src/Systems/Base/Surface.cpp

src/Systems/Base/Surface.hpp

src/Systems/Base/System.cpp

src/Systems/Base/TextKeyCursor.cpp

src/Systems/Base/TextKeyCursor.hpp

src/Systems/Base/TextPage.hpp

src/Systems/Base/TextSystem.cpp

src/Systems/Base/TextSystem.hpp

src/Systems/Base/TextWakuNormal.cpp

src/Systems/Base/TextWakuNormal.hpp

src/Systems/Base/TextWakuType4.cpp

src/Systems/Base/TextWakuType4.hpp

src/Systems/Base/TextWindow.cpp

src/Systems/Base/TextWindow.hpp

src/Systems/Base/TextWindowButton.cpp

src/Systems/Base/TextWindowButton.hpp

src/Systems/SDL/SDLGraphicsSystem.cpp

src/Systems/SDL/SDLGraphicsSystem.hpp

src/Systems/SDL/SDLMusic.cpp

src/Systems/SDL/SDLMusic.hpp

src/Systems/SDL/SDLRenderToTextureSurface.cpp

src/Systems/SDL/SDLRenderToTextureSurface.hpp

src/Systems/SDL/SDLSoundSystem.cpp

src/Systems/SDL/SDLSoundSystem.hpp

src/Systems/SDL/SDLSurface.cpp

src/Systems/SDL/SDLSurface.hpp

src/Systems/SDL/SDLTextWindow.cpp

src/Systems/SDL/SDLUtils.cpp

src/Systems/SDL/SDLUtils.hpp

src/Systems/SDL/Texture.cpp

src/Systems/SDL/Texture.hpp

src/Utilities/Exception.cpp

src/Utilities/Exception.hpp

src/Utilities/LazyArray.hpp

src/Utilities/StringUtilities.cpp

src/Utilities/findFontFile.cpp

src/libReallive/archive.cpp

src/libReallive/archive.h

src/libReallive/bytecode.cpp

src/libReallive/bytecode.h

src/libReallive/expression.cpp

src/libReallive/expression.h

src/libReallive/expression_pieces.h

src/libReallive/scenario.cpp

src/libReallive/scenario.h

src/libReallive/scenario_internals.h

test/Little_Busters/Rin-bad.lua

test/ScriptMachine/ScriptMachine.cpp

test/ScriptMachine/ScriptWorld.cpp

test/TestSystem/MockSurface.hpp

test/TestSystem/TestGraphicsSystem.cpp

test/TestSystem/TestGraphicsSystem.hpp

test/TestSystem/TestMachine.cpp

test/TestSystem/TestSoundSystem.cpp

test/TestSystem/TestSoundSystem.hpp

test/TestSystem/TestTextSystem.cpp

test/TestSystem/TestTextSystem.hpp

test/expression_test.cpp

test/graphics_object_test.cpp

test/luaRlvm.cpp

test/text_system_test.cpp

vendor/luabind/include/luabind/detail/call_function.hpp

vendor/luabind/include/luabind/detail/call_member.hpp

vendor/luabind/include/luabind/wrapper_base.hpp

vendor/xclannad/file.cc

vendor/xclannad/file.h

Show diffs side-by-side

added added

removed removed

src/Systems/SDL/Texture.hpp

50

50

public:

51

51

static void SetScreenSize(const Size& s);

52

52

53

static int ScreenHeight();

54

53

55

public:

54

56

Texture(SDL_Surface* surface, int x, int y, int w, int h,

55

57

unsigned int bytes_per_pixel, int byte_order, int byte_type);

70

72

71

73

void renderToScreenAsObject(

72

74

const GraphicsObject& go,

73

SDLSurface& surface,

75

const SDLSurface& surface,

74

76

const Rect& srcRect, const Rect& dstRect,

75

77

int alpha);

76

78

82

84

void renderToScreen(const Rect& src, const Rect& dst,

83

85

const int opacity[4]);

84

86

85

void buildShader();

86

std::string getSubtractiveShaderString();

87

88

87

private:

89

88

// Returns a shared buffer of at least size. This is not thread safe

90

89

// or reenterant in the least; it is merely meant to prevent

101

100

const Rect& src, const Rect& dst, const RGBAColour& rgba);

102

101

103

102

bool filterCoords(int& x1, int& y1, int& x2, int& y2,

104

float& dx1, float& dy1, float& dx2, float& dy2);

103

int& dx1, int& dy1, int& dx2, int& dy2);

105

104

106

105

int x_offset_;

107

106

int y_offset_;

119

118

120

119

GLuint back_texture_id_;

121

120

122

GLuint shader_object_id_;

123

GLuint program_object_id_;

124

125

121

/// Is this texture upside down? (Because it's a screenshot, et cetera.)

126

122

bool is_upside_down_;

127

123

Older »