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-11-29 16:18:38 +01:00
parent 1cba874f2f
commit 2fd2542be7
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PanoPainter.xcodeproj/project.pbxproj
View File

@@ -265,6 +265,10 @@
ADE4911D1F86E65E00FB8E92 /* shapes.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491111F86D09100FB8E92 /* shapes.cc */; }; ADE4911D1F86E65E00FB8E92 /* shapes.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491111F86D09100FB8E92 /* shapes.cc */; };
ADE4911E1F86E65E00FB8E92 /* sweep_context.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491141F86D09100FB8E92 /* sweep_context.cc */; }; ADE4911E1F86E65E00FB8E92 /* sweep_context.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491141F86D09100FB8E92 /* sweep_context.cc */; };
ADE4911F1F86E65E00FB8E92 /* sweep.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491131F86D09100FB8E92 /* sweep.cc */; }; ADE4911F1F86E65E00FB8E92 /* sweep.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491131F86D09100FB8E92 /* sweep.cc */; };
ADE86C0D2390ABCF006A52C5 /* 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 */; };
ADE86C102390ABCF006A52C5 /* node_remote_page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE86C0A2390ABCF006A52C5 /* node_remote_page.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 */; };
@@ -590,6 +594,10 @@
ADE491131F86D09100FB8E92 /* sweep.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sweep.cc; path = libs/poly2tri/poly2tri/sweep/sweep.cc; sourceTree = "<group>"; }; ADE491131F86D09100FB8E92 /* sweep.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sweep.cc; path = libs/poly2tri/poly2tri/sweep/sweep.cc; sourceTree = "<group>"; };
ADE491141F86D09100FB8E92 /* sweep_context.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sweep_context.cc; path = libs/poly2tri/poly2tri/sweep/sweep_context.cc; sourceTree = "<group>"; }; ADE491141F86D09100FB8E92 /* sweep_context.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sweep_context.cc; path = libs/poly2tri/poly2tri/sweep/sweep_context.cc; sourceTree = "<group>"; };
ADE491151F86D09100FB8E92 /* cdt.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cdt.cc; path = libs/poly2tri/poly2tri/sweep/cdt.cc; sourceTree = "<group>"; }; ADE491151F86D09100FB8E92 /* cdt.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cdt.cc; path = libs/poly2tri/poly2tri/sweep/cdt.cc; sourceTree = "<group>"; };
ADE86C092390ABCF006A52C5 /* node_metadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_metadata.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>"; };
ADE86C0C2390ABCF006A52C5 /* node_metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_metadata.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; };
@@ -810,6 +818,8 @@
AD83A0D8232A7906005B0871 /* node_input_box.h */, AD83A0D8232A7906005B0871 /* node_input_box.h */,
AD1063651EC7ADFA002A525F /* node_message_box.cpp */, AD1063651EC7ADFA002A525F /* node_message_box.cpp */,
AD1063661EC7ADFA002A525F /* node_message_box.h */, AD1063661EC7ADFA002A525F /* node_message_box.h */,
ADE86C092390ABCF006A52C5 /* node_metadata.cpp */,
ADE86C0C2390ABCF006A52C5 /* node_metadata.h */,
ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */, ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */,
ADEF1F18235BB2E90043D5C4 /* node_panel_animation.h */, ADEF1F18235BB2E90043D5C4 /* node_panel_animation.h */,
AD1063671EC7ADFA002A525F /* node_panel_brush.cpp */, AD1063671EC7ADFA002A525F /* node_panel_brush.cpp */,
@@ -830,6 +840,8 @@
AD1063701EC7ADFA002A525F /* node_popup_menu.h */, AD1063701EC7ADFA002A525F /* node_popup_menu.h */,
ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */, ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */,
ADD6AFD51F94DEAF00E92461 /* node_progress_bar.h */, ADD6AFD51F94DEAF00E92461 /* node_progress_bar.h */,
ADE86C0A2390ABCF006A52C5 /* node_remote_page.cpp */,
ADE86C0B2390ABCF006A52C5 /* node_remote_page.h */,
AD1063711EC7ADFA002A525F /* node_settings.cpp */, AD1063711EC7ADFA002A525F /* node_settings.cpp */,
AD1063721EC7ADFA002A525F /* node_settings.h */, AD1063721EC7ADFA002A525F /* node_settings.h */,
AD1063731EC7ADFA002A525F /* node_slider.cpp */, AD1063731EC7ADFA002A525F /* node_slider.cpp */,
@@ -1583,6 +1595,7 @@
ADA2A57922BE8D8E00C6B6C9 /* node_tool_bucket.cpp in Sources */, ADA2A57922BE8D8E00C6B6C9 /* node_tool_bucket.cpp in Sources */,
AD0E5CD31ECC72AD00C35669 /* app_layout.cpp in Sources */, AD0E5CD31ECC72AD00C35669 /* app_layout.cpp in Sources */,
AD0E5CC71ECC72AD00C35669 /* node_panel_stroke.cpp in Sources */, AD0E5CC71ECC72AD00C35669 /* node_panel_stroke.cpp in Sources */,
ADE86C0E2390ABCF006A52C5 /* node_metadata.cpp in Sources */,
AD0E5CC61ECC72AD00C35669 /* node_panel_layer.cpp in Sources */, AD0E5CC61ECC72AD00C35669 /* node_panel_layer.cpp in Sources */,
AD0E5CBA1ECC72AD00C35669 /* node_button_custom.cpp in Sources */, AD0E5CBA1ECC72AD00C35669 /* node_button_custom.cpp in Sources */,
AD7FB078223E8A42005913AB /* YGStyle.cpp in Sources */, AD7FB078223E8A42005913AB /* YGStyle.cpp in Sources */,
@@ -1608,6 +1621,7 @@
AD0E5CD91ECC72AD00C35669 /* canvas.cpp in Sources */, AD0E5CD91ECC72AD00C35669 /* canvas.cpp in Sources */,
ADE4911E1F86E65E00FB8E92 /* sweep_context.cc in Sources */, ADE4911E1F86E65E00FB8E92 /* sweep_context.cc in Sources */,
AD7FB07C223E8A42005913AB /* log.cpp in Sources */, AD7FB07C223E8A42005913AB /* log.cpp in Sources */,
ADE86C102390ABCF006A52C5 /* node_remote_page.cpp in Sources */,
AD0E5CB81ECC72AD00C35669 /* node.cpp in Sources */, AD0E5CB81ECC72AD00C35669 /* node.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@@ -1702,6 +1716,7 @@
AD1063A01EC7AE92002A525F /* node_image.cpp in Sources */, AD1063A01EC7AE92002A525F /* node_image.cpp in Sources */,
AD10639F1EC7AE92002A525F /* node_image_texture.cpp in Sources */, AD10639F1EC7AE92002A525F /* node_image_texture.cpp in Sources */,
ADEF1F19235BB2E90043D5C4 /* node_panel_animation.cpp in Sources */, ADEF1F19235BB2E90043D5C4 /* node_panel_animation.cpp in Sources */,
ADE86C0F2390ABCF006A52C5 /* node_remote_page.cpp in Sources */,
ADD7D2721EBF9AE300D5A897 /* AppDelegate.m in Sources */, ADD7D2721EBF9AE300D5A897 /* AppDelegate.m in Sources */,
AD1063981EC7AE92002A525F /* node_button_custom.cpp in Sources */, AD1063981EC7AE92002A525F /* node_button_custom.cpp in Sources */,
ADBC8C4E1FAE7D360094B339 /* node_dialog_browse.cpp in Sources */, ADBC8C4E1FAE7D360094B339 /* node_dialog_browse.cpp in Sources */,
@@ -1713,6 +1728,7 @@
ADD7D2791EBF9AE300D5A897 /* GameViewController.m in Sources */, ADD7D2791EBF9AE300D5A897 /* GameViewController.m in Sources */,
AD4CEF142156B2C60097F4BD /* node_about.cpp in Sources */, AD4CEF142156B2C60097F4BD /* node_about.cpp in Sources */,
AD439B602210F423006EAE8E /* format.cc in Sources */, AD439B602210F423006EAE8E /* format.cc in Sources */,
ADE86C0D2390ABCF006A52C5 /* node_metadata.cpp in Sources */,
ADD7D26F1EBF9AE300D5A897 /* main.cpp in Sources */, ADD7D26F1EBF9AE300D5A897 /* main.cpp in Sources */,
ADC0EB431FC36E88004079BB /* node_dialog_picker.cpp in Sources */, ADC0EB431FC36E88004079BB /* node_dialog_picker.cpp in Sources */,
ADD7D2A01EBF9E1C00D5A897 /* image.cpp in Sources */, ADD7D2A01EBF9E1C00D5A897 /* image.cpp in Sources */,

2
src/app.h
View File

@@ -4,7 +4,6 @@
#include "shader.h" #include "shader.h"
#include "shape.h" #include "shape.h"
#include "texture.h" #include "texture.h"
#include "layout.h"
#include "font.h" #include "font.h"
#include "rtt.h" #include "rtt.h"
#include "image.h" #include "image.h"
@@ -24,6 +23,7 @@
#include "node_panel_quick.h" #include "node_panel_quick.h"
#include "node_input_box.h" #include "node_input_box.h"
#include "node_panel_animation.h" #include "node_panel_animation.h"
#include "layout.h"
#if defined(__OBJC__) && defined(__IOS__) #if defined(__OBJC__) && defined(__IOS__)
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>

2
src/layout.cpp
View File

@@ -1,10 +1,10 @@
#include "pch.h" #include "pch.h"
#include "log.h" #include "log.h"
#include "layout.h"
#include "util.h" #include "util.h"
#include "asset.h" #include "asset.h"
#include "node.h" #include "node.h"
#include "node_border.h" #include "node_border.h"
#include "layout.h"
void LayoutManager::unload() void LayoutManager::unload()
{ {