omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update xcode

Browse Source
This commit is contained in:
omigamedev
2019-12-02 08:49:15 +01:00
parent 396b3afd42
commit baec98835a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PanoPainter.xcodeproj/project.pbxproj
View File

@@ -269,6 +269,8 @@
ADE86C0E2390ABCF006A52C5 /* node_metadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C092390ABCF006A52C5 /* node_metadata.cpp */; }; ADE86C0E2390ABCF006A52C5 /* node_metadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C092390ABCF006A52C5 /* node_metadata.cpp */; };
ADE86C0F2390ABCF006A52C5 /* node_remote_page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C0A2390ABCF006A52C5 /* node_remote_page.cpp */; }; ADE86C0F2390ABCF006A52C5 /* node_remote_page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C0A2390ABCF006A52C5 /* node_remote_page.cpp */; };
ADE86C102390ABCF006A52C5 /* node_remote_page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C0A2390ABCF006A52C5 /* node_remote_page.cpp */; }; ADE86C102390ABCF006A52C5 /* node_remote_page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C0A2390ABCF006A52C5 /* node_remote_page.cpp */; };
ADE86C13239472A1006A52C5 /* node_shorcuts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C11239472A1006A52C5 /* node_shorcuts.cpp */; };
ADE86C14239472A1006A52C5 /* node_shorcuts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C11239472A1006A52C5 /* node_shorcuts.cpp */; };
ADEBA9062069A4F40085AE16 /* objc_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEBA9052069A4F40085AE16 /* objc_utils.cpp */; }; ADEBA9062069A4F40085AE16 /* objc_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEBA9052069A4F40085AE16 /* objc_utils.cpp */; };
ADEBA9092069A50E0085AE16 /* objc_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEBA9082069A50E0085AE16 /* objc_utils.cpp */; }; ADEBA9092069A50E0085AE16 /* objc_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEBA9082069A50E0085AE16 /* objc_utils.cpp */; };
ADEF1F19235BB2E90043D5C4 /* node_panel_animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */; }; ADEF1F19235BB2E90043D5C4 /* node_panel_animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */; };
@@ -598,6 +600,8 @@
ADE86C0A2390ABCF006A52C5 /* node_remote_page.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_remote_page.cpp; sourceTree = "<group>"; }; ADE86C0A2390ABCF006A52C5 /* node_remote_page.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_remote_page.cpp; sourceTree = "<group>"; };
ADE86C0B2390ABCF006A52C5 /* node_remote_page.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_remote_page.h; sourceTree = "<group>"; }; ADE86C0B2390ABCF006A52C5 /* node_remote_page.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_remote_page.h; sourceTree = "<group>"; };
ADE86C0C2390ABCF006A52C5 /* node_metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_metadata.h; sourceTree = "<group>"; }; ADE86C0C2390ABCF006A52C5 /* node_metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_metadata.h; sourceTree = "<group>"; };
ADE86C11239472A1006A52C5 /* node_shorcuts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_shorcuts.cpp; sourceTree = "<group>"; };
ADE86C12239472A1006A52C5 /* node_shorcuts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_shorcuts.h; sourceTree = "<group>"; };
ADEBA9042069A4F30085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = src/objc_utils.h; sourceTree = SOURCE_ROOT; }; ADEBA9042069A4F30085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = src/objc_utils.h; sourceTree = SOURCE_ROOT; };
ADEBA9052069A4F40085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = src/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; ADEBA9052069A4F40085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = src/objc_utils.cpp; sourceTree = SOURCE_ROOT; };
ADEBA9072069A50E0085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = src/objc_utils.h; sourceTree = SOURCE_ROOT; }; ADEBA9072069A50E0085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = src/objc_utils.h; sourceTree = SOURCE_ROOT; };
@@ -844,6 +848,8 @@
ADE86C0B2390ABCF006A52C5 /* node_remote_page.h */, ADE86C0B2390ABCF006A52C5 /* node_remote_page.h */,
AD1063711EC7ADFA002A525F /* node_settings.cpp */, AD1063711EC7ADFA002A525F /* node_settings.cpp */,
AD1063721EC7ADFA002A525F /* node_settings.h */, AD1063721EC7ADFA002A525F /* node_settings.h */,
ADE86C11239472A1006A52C5 /* node_shorcuts.cpp */,
ADE86C12239472A1006A52C5 /* node_shorcuts.h */,
AD1063731EC7ADFA002A525F /* node_slider.cpp */, AD1063731EC7ADFA002A525F /* node_slider.cpp */,
AD1063741EC7ADFA002A525F /* node_slider.h */, AD1063741EC7ADFA002A525F /* node_slider.h */,
AD0E11951ECA20F200CDA6BB /* node_scroll.cpp */, AD0E11951ECA20F200CDA6BB /* node_scroll.cpp */,
@@ -1537,6 +1543,7 @@
AD0E5CD81ECC72AD00C35669 /* canvas_modes.cpp in Sources */, AD0E5CD81ECC72AD00C35669 /* canvas_modes.cpp in Sources */,
AD7FB088223E8A43005913AB /* YGEnums.cpp in Sources */, AD7FB088223E8A43005913AB /* YGEnums.cpp in Sources */,
AD0E5CA31ECC6F2B00C35669 /* main.cpp in Sources */, AD0E5CA31ECC6F2B00C35669 /* main.cpp in Sources */,
ADE86C14239472A1006A52C5 /* node_shorcuts.cpp in Sources */,
AD0E5CB21ECC72AD00C35669 /* jpge.cpp in Sources */, AD0E5CB21ECC72AD00C35669 /* jpge.cpp in Sources */,
ADDC18C622B43004008D7F60 /* canvas_layer.cpp in Sources */, ADDC18C622B43004008D7F60 /* canvas_layer.cpp in Sources */,
ADC6F4681F3E66FB004177FA /* app_dialogs.cpp in Sources */, ADC6F4681F3E66FB004177FA /* app_dialogs.cpp in Sources */,
@@ -1659,6 +1666,7 @@
ADD7D2901EBF9E1C00D5A897 /* canvas_modes.cpp in Sources */, ADD7D2901EBF9E1C00D5A897 /* canvas_modes.cpp in Sources */,
AD7FB079223E8A42005913AB /* Yoga.cpp in Sources */, AD7FB079223E8A42005913AB /* Yoga.cpp in Sources */,
AD7FB083223E8A43005913AB /* YGConfig.cpp in Sources */, AD7FB083223E8A43005913AB /* YGConfig.cpp in Sources */,
ADE86C13239472A1006A52C5 /* node_shorcuts.cpp in Sources */,
ADC6F4621F3AFF2C004177FA /* node_dialog_layer_rename.cpp in Sources */, ADC6F4621F3AFF2C004177FA /* node_dialog_layer_rename.cpp in Sources */,
AD10639A1EC7AE92002A525F /* node_canvas.cpp in Sources */, AD10639A1EC7AE92002A525F /* node_canvas.cpp in Sources */,
ADD7D2A31EBFA06F00D5A897 /* tinyxml2.cpp in Sources */, ADD7D2A31EBFA06F00D5A897 /* tinyxml2.cpp in Sources */,

2
src/font.h
View File

@@ -19,7 +19,7 @@ public:
std::vector<stbtt_bakedchar> chars; std::vector<stbtt_bakedchar> chars;
float scale = 1.f; float scale = 1.f;
Font() noexcept = default; Font() = default;
Font(const Font&) = delete; Font(const Font&) = delete;
void operator=(const Font&) = delete; void operator=(const Font&) = delete;
Font(Font&& other) noexcept; Font(Font&& other) noexcept;