diff --git a/PanoPainter.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj index 73af6c1..3b65902 100644 --- a/PanoPainter.xcodeproj/project.pbxproj +++ b/PanoPainter.xcodeproj/project.pbxproj @@ -206,6 +206,10 @@ 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 */; }; + 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 */; }; + ADF6C5852231EB5E0097BFD9 /* serializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADF6C5802231EB5D0097BFD9 /* serializer.cpp */; }; ADFD32152166AA0800F46F85 /* GenerateThumbnailForURL.c in Sources */ = {isa = PBXBuildFile; fileRef = ADFD32142166AA0800F46F85 /* GenerateThumbnailForURL.c */; }; ADFD32172166AA0800F46F85 /* GeneratePreviewForURL.c in Sources */ = {isa = PBXBuildFile; fileRef = ADFD32162166AA0800F46F85 /* GeneratePreviewForURL.c */; }; ADFD32192166AA0800F46F85 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = ADFD32182166AA0800F46F85 /* main.c */; }; @@ -480,6 +484,10 @@ 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 = ""; }; + 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 = ""; }; + ADF6C5812231EB5E0097BFD9 /* serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serializer.h; sourceTree = ""; }; ADFD32122166AA0800F46F85 /* QLPlugin.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QLPlugin.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; }; ADFD32142166AA0800F46F85 /* GenerateThumbnailForURL.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = GenerateThumbnailForURL.c; sourceTree = ""; }; ADFD32162166AA0800F46F85 /* GeneratePreviewForURL.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = GeneratePreviewForURL.c; sourceTree = ""; }; @@ -754,6 +762,8 @@ AD4C08D21E89BD0F0051D85F /* bezier.h */, AD4C08D31E89BD0F0051D85F /* brush.cpp */, AD4C08D41E89BD0F0051D85F /* brush.h */, + ADF6C57F2231EB5D0097BFD9 /* binary_stream.cpp */, + ADF6C57E2231EB5D0097BFD9 /* binary_stream.h */, AD744B6C1EBC9EF700B66E30 /* canvas_modes.cpp */, AD744B6D1EBC9EF800B66E30 /* canvas_modes.h */, AD4C08D51E89BD0F0051D85F /* canvas.cpp */, @@ -773,6 +783,8 @@ AD4C08D81E89BD0F0051D85F /* rtt.h */, AD02F0C01EDC456800B2E692 /* sequencer.cpp */, AD02F0C11EDC456800B2E692 /* sequencer.h */, + ADF6C5802231EB5D0097BFD9 /* serializer.cpp */, + ADF6C5812231EB5E0097BFD9 /* serializer.h */, AD58E0631E2A76FD006ACC15 /* shader.cpp */, AD58E0641E2A76FD006ACC15 /* shader.h */, AD58E06D1E2A80BC006ACC15 /* shape.cpp */, @@ -1309,6 +1321,7 @@ files = ( ADE4911F1F86E65E00FB8E92 /* sweep.cc in Sources */, AD0E5CB91ECC72AD00C35669 /* node_border.cpp in Sources */, + ADF6C5832231EB5E0097BFD9 /* binary_stream.cpp in Sources */, AD0E5CC81ECC72AD00C35669 /* node_popup_menu.cpp in Sources */, AD0E5CB71ECC72AD00C35669 /* layout.cpp in Sources */, ADEBA9062069A4F40085AE16 /* objc_utils.cpp in Sources */, @@ -1357,6 +1370,7 @@ AD02F0C41EDC457C00B2E692 /* sequencer.cpp in Sources */, AD0E5CCD1ECC72AD00C35669 /* node_text_input.cpp in Sources */, AD0E5CE21ECC72AD00C35669 /* texture.cpp in Sources */, + ADF6C5852231EB5E0097BFD9 /* serializer.cpp in Sources */, AD0E5CCC1ECC72AD00C35669 /* node_stroke_preview.cpp in Sources */, AD0E5CDE1ECC72AD00C35669 /* pch.cpp in Sources */, AD0E5CCF1ECC72AD00C35669 /* node_viewport.cpp in Sources */, @@ -1431,6 +1445,7 @@ ADE491171F86E65D00FB8E92 /* cdt.cc in Sources */, ADD7D29F1EBF9E1C00D5A897 /* app.cpp in Sources */, AD1063A41EC7AE92002A525F /* node_panel_layer.cpp in Sources */, + ADF6C5842231EB5E0097BFD9 /* serializer.cpp in Sources */, AD1063AA1EC7AE92002A525F /* node_text_input.cpp in Sources */, AD2286C3214E9A2B0074567E /* version.cpp in Sources */, ADC0EB3E1FBDC748004079BB /* node_colorwheel.cpp in Sources */, @@ -1472,6 +1487,7 @@ ADD7D2A01EBF9E1C00D5A897 /* image.cpp in Sources */, ADD7D2A11EBF9E1C00D5A897 /* texture.cpp in Sources */, AD0E119C1ECA215600CDA6BB /* app_events.cpp in Sources */, + ADF6C5822231EB5E0097BFD9 /* binary_stream.cpp in Sources */, ADFD32272166C9A000F46F85 /* node_dialog_resize.cpp in Sources */, ADBC8C551FAFD0520094B339 /* app_cloud.cpp in Sources */, ADD7D2961EBF9E1C00D5A897 /* brush.cpp in Sources */, diff --git a/src/serializer.h b/src/serializer.h index 961578e..fe13218 100644 --- a/src/serializer.h +++ b/src/serializer.h @@ -465,14 +465,14 @@ public: } virtual bool read(BinaryStreamReader& r) override { - x = r.ru32(); - y = r.ru32(); + x = r.ru16(); + y = r.ru16(); return true; } virtual void write(BinaryStreamWriter& w) const override { - w.wu32(x); - w.wu32(y); + w.wu16(x); + w.wu16(y); } }; struct Channel : public Type @@ -526,6 +526,7 @@ public: r.skip(length - 23); return true; } + return true; } virtual void write(BinaryStreamWriter& w) const override {