From 7561bed8d28aeae52545d513f07121a2ed4a695f Mon Sep 17 00:00:00 2001 From: omigamedev Date: Fri, 17 May 2019 12:07:57 +0200 Subject: [PATCH] fix shader precision, update Xcode project --- PanoPainter.xcodeproj/project.pbxproj | 8 ++++++++ data/shaders/texture-mask.glsl | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/PanoPainter.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj index 38c35b0..f07846b 100644 --- a/PanoPainter.xcodeproj/project.pbxproj +++ b/PanoPainter.xcodeproj/project.pbxproj @@ -228,6 +228,8 @@ ADEBA9092069A50E0085AE16 /* objc_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEBA9082069A50E0085AE16 /* objc_utils.cpp */; }; ADF396DD216F749200024722 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADF396DB216F6BD800024722 /* AppKit.framework */; }; ADF396DF216FA6C900024722 /* pp-icon-square.png in Resources */ = {isa = PBXBuildFile; fileRef = ADF396DE216FA6C700024722 /* pp-icon-square.png */; }; + ADF4F7752263920400422C7C /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADF4F7742263920400422C7C /* settings.cpp */; }; + ADF4F7762263920400422C7C /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADF4F7742263920400422C7C /* settings.cpp */; }; ADF6C5822231EB5E0097BFD9 /* binary_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADF6C57F2231EB5D0097BFD9 /* binary_stream.cpp */; }; ADF6C5832231EB5E0097BFD9 /* binary_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADF6C57F2231EB5D0097BFD9 /* binary_stream.cpp */; }; ADF6C5842231EB5E0097BFD9 /* serializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADF6C5802231EB5D0097BFD9 /* serializer.cpp */; }; @@ -534,6 +536,8 @@ ADEBA9082069A50E0085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = src/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; ADF396DB216F6BD800024722 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; ADF396DE216FA6C700024722 /* pp-icon-square.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pp-icon-square.png"; path = "extra/pp-icon-square.png"; sourceTree = ""; }; + ADF4F7732263920400422C7C /* settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = settings.h; sourceTree = ""; }; + ADF4F7742263920400422C7C /* settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = settings.cpp; sourceTree = ""; }; ADF6C57E2231EB5D0097BFD9 /* binary_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = binary_stream.h; sourceTree = ""; }; ADF6C57F2231EB5D0097BFD9 /* binary_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = binary_stream.cpp; sourceTree = ""; }; ADF6C5802231EB5D0097BFD9 /* serializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serializer.cpp; sourceTree = ""; }; @@ -838,6 +842,8 @@ AD02F0C11EDC456800B2E692 /* sequencer.h */, ADF6C5802231EB5D0097BFD9 /* serializer.cpp */, ADF6C5812231EB5E0097BFD9 /* serializer.h */, + ADF4F7742263920400422C7C /* settings.cpp */, + ADF4F7732263920400422C7C /* settings.h */, AD58E0631E2A76FD006ACC15 /* shader.cpp */, AD58E0641E2A76FD006ACC15 /* shader.h */, AD58E06D1E2A80BC006ACC15 /* shape.cpp */, @@ -1483,6 +1489,7 @@ AD0E5CD01ECC72AD00C35669 /* action.cpp in Sources */, AD0E5CC01ECC72AD00C35669 /* node_icon.cpp in Sources */, AD0E5CC11ECC72AD00C35669 /* node_image_texture.cpp in Sources */, + ADF4F7762263920400422C7C /* settings.cpp in Sources */, AD0E5CBD1ECC72AD00C35669 /* node_checkbox.cpp in Sources */, ADBC8C581FAFD05A0094B339 /* node_dialog_cloud.cpp in Sources */, AD7FB086223E8A43005913AB /* YGLayout.cpp in Sources */, @@ -1539,6 +1546,7 @@ ADD7D29C1EBF9E1C00D5A897 /* shader.cpp in Sources */, AD7FB089223E8A43005913AB /* Utils.cpp in Sources */, ADD7D2921EBF9E1C00D5A897 /* action.cpp in Sources */, + ADF4F7752263920400422C7C /* settings.cpp in Sources */, ADD7D29A1EBF9E1C00D5A897 /* pch.cpp in Sources */, AD7FB077223E8A42005913AB /* YGStyle.cpp in Sources */, AD10639E1EC7AE92002A525F /* node_icon.cpp in Sources */, diff --git a/data/shaders/texture-mask.glsl b/data/shaders/texture-mask.glsl index f3e50f2..15fa64b 100644 --- a/data/shaders/texture-mask.glsl +++ b/data/shaders/texture-mask.glsl @@ -15,7 +15,7 @@ void main() [[fragment]] uniform sampler2D tex; -uniform vec2 pattern_offset; +uniform mediump vec2 pattern_offset; in mediump vec2 uv; out mediump vec4 frag;