diff --git a/.gitmodules b/.gitmodules index 628cbb10fc..d9eb2bf5fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -53,3 +53,6 @@ [submodule "3party/gflags"] path = 3party/gflags url = https://github.com/gflags/gflags +[submodule "3party/fast_obj"] + path = 3party/fast_obj + url = https://github.com/thisistherk/fast_obj diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt index 9c9674a1b3..d21ce23047 100644 --- a/3party/CMakeLists.txt +++ b/3party/CMakeLists.txt @@ -45,13 +45,15 @@ if (NOT LINUX_DETECTED) add_subdirectory(icu) endif() +add_subdirectory(fast_obj) add_subdirectory(liboauthcpp) add_subdirectory(minizip) +add_subdirectory(open-location-code) add_subdirectory(opening_hours) add_subdirectory(sdf_image) add_subdirectory(stb_image) add_subdirectory(succinct) -add_subdirectory(open-location-code) + add_subdirectory(vulkan_wrapper) if (PLATFORM_DESKTOP) diff --git a/3party/fast_obj b/3party/fast_obj new file mode 160000 index 0000000000..1a8060257a --- /dev/null +++ b/3party/fast_obj @@ -0,0 +1 @@ +Subproject commit 1a8060257a96401a9555a476bd13c3a87502c9b5 diff --git a/data/copyright.html b/data/copyright.html index 7ceb4c27af..21e8e3cd38 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -161,6 +161,9 @@
  • Expat
    © 1998–2000 Thai Open Source Software Center Ltd and Clark Cooper, © 2001–2019 Expat maintainers; MIT License
    • +
  • fast_obj
    + © 2013 thisistherk; MIT License
    • +
  • FreeType
    © 2013 The FreeType Project; FTL
    • diff --git a/drape_frontend/CMakeLists.txt b/drape_frontend/CMakeLists.txt index dc37ff83b9..871d6eacff 100644 --- a/drape_frontend/CMakeLists.txt +++ b/drape_frontend/CMakeLists.txt @@ -212,6 +212,7 @@ omim_add_library(${PROJECT_NAME} ${SRC}) target_link_libraries(${PROJECT_NAME} editor drape + fast_obj_lib indexer traffic transit diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 904ef4c418..fd9cb876ed 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -461,6 +461,7 @@ CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA27832245090900167D87 /* ListenerContainer.swift */; }; CDCA278622451F5000167D87 /* RouteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA278522451F5000167D87 /* RouteInfo.swift */; }; CDCA278E2248F34C00167D87 /* MWMRoutingManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA278B2248F34C00167D87 /* MWMRoutingManager.mm */; }; + EBA1BC3D2A3BD69E00E33F7A /* libfast_obj.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBA1BC3C2A3BD69E00E33F7A /* libfast_obj.a */; }; F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_clear */; }; F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = F607C1841C032A8800B53A87 /* resources-hdpi_dark */; }; F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */ = {isa = PBXBuildFile; fileRef = F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */; }; @@ -1315,6 +1316,7 @@ CDCA278C2248F34C00167D87 /* MWMRouterResultCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterResultCode.h; sourceTree = ""; }; CDCA278F2248F3B800167D87 /* MWMLocationModeListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMLocationModeListener.h; sourceTree = ""; }; CDE0F3AD225B8D45008BA5C3 /* MWMSpeedCameraManagerMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSpeedCameraManagerMode.h; sourceTree = ""; }; + EBA1BC3C2A3BD69E00E33F7A /* libfast_obj.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libfast_obj.a; sourceTree = BUILT_PRODUCTS_DIR; }; ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = ""; }; ED48BBB917C2B1E2003E7E92 /* CircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleView.m; sourceTree = ""; }; EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; }; @@ -1626,6 +1628,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + EBA1BC3D2A3BD69E00E33F7A /* libfast_obj.a in Frameworks */, FA456C3C26BDC6AD00B83C20 /* Chart.framework in Frameworks */, FA853BF326BC5DE50026D455 /* libshaders.a in Frameworks */, FA853BEF26BC5BA40026D455 /* libdescriptions.a in Frameworks */, @@ -1762,6 +1765,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + EBA1BC3C2A3BD69E00E33F7A /* libfast_obj.a */, FA456C3B26BDC6AD00B83C20 /* Chart.framework */, FA853BF226BC5DE50026D455 /* libshaders.a */, FA853BF026BC5C120026D455 /* libshaders.a */, diff --git a/xcode/fast_obj/fast_obj.xcodeproj/project.pbxproj b/xcode/fast_obj/fast_obj.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..488a83a7de --- /dev/null +++ b/xcode/fast_obj/fast_obj.xcodeproj/project.pbxproj @@ -0,0 +1,191 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 675D21C61BFB8F2B00717E4F /* fast_obj.h in Headers */ = {isa = PBXBuildFile; fileRef = 675D21C41BFB8F2B00717E4F /* fast_obj.h */; }; + EBA1BC3B2A3BD5AB00E33F7A /* fast_obj.c in Sources */ = {isa = PBXBuildFile; fileRef = EBA1BC3A2A3BD5AB00E33F7A /* fast_obj.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 34EBB47E1DBF52D3005BE9B8 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 34EBB47F1DBF52D3005BE9B8 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; + 675D21BA1BFB8DBA00717E4F /* libfast_obj.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfast_obj.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 675D21C41BFB8F2B00717E4F /* fast_obj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fast_obj.h; sourceTree = ""; }; + EBA1BC3A2A3BD5AB00E33F7A /* fast_obj.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fast_obj.c; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 675D21B71BFB8DBA00717E4F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 675D21B11BFB8DBA00717E4F = { + isa = PBXGroup; + children = ( + 34EBB47E1DBF52D3005BE9B8 /* common-debug.xcconfig */, + 34EBB47F1DBF52D3005BE9B8 /* common-release.xcconfig */, + 675D21C21BFB8F1000717E4F /* fast_obj */, + 675D21BB1BFB8DBA00717E4F /* Products */, + ); + sourceTree = ""; + }; + 675D21BB1BFB8DBA00717E4F /* Products */ = { + isa = PBXGroup; + children = ( + 675D21BA1BFB8DBA00717E4F /* libfast_obj.a */, + ); + name = Products; + sourceTree = ""; + }; + 675D21C21BFB8F1000717E4F /* fast_obj */ = { + isa = PBXGroup; + children = ( + EBA1BC3A2A3BD5AB00E33F7A /* fast_obj.c */, + 675D21C41BFB8F2B00717E4F /* fast_obj.h */, + ); + name = fast_obj; + path = ../../3party/fast_obj; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 675D21B81BFB8DBA00717E4F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 675D21C61BFB8F2B00717E4F /* fast_obj.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 675D21B91BFB8DBA00717E4F /* fast_obj */ = { + isa = PBXNativeTarget; + buildConfigurationList = 675D21BE1BFB8DBA00717E4F /* Build configuration list for PBXNativeTarget "fast_obj" */; + buildPhases = ( + 675D21B61BFB8DBA00717E4F /* Sources */, + 675D21B71BFB8DBA00717E4F /* Frameworks */, + 675D21B81BFB8DBA00717E4F /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = fast_obj; + productName = fast_obj; + productReference = 675D21BA1BFB8DBA00717E4F /* libfast_obj.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 675D21B21BFB8DBA00717E4F /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1410; + TargetAttributes = { + 675D21B91BFB8DBA00717E4F = { + CreatedOnToolsVersion = 7.1.1; + }; + }; + }; + buildConfigurationList = 675D21B51BFB8DBA00717E4F /* Build configuration list for PBXProject "fast_obj" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 675D21B11BFB8DBA00717E4F; + productRefGroup = 675D21BB1BFB8DBA00717E4F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 675D21B91BFB8DBA00717E4F /* fast_obj */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 675D21B61BFB8DBA00717E4F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + EBA1BC3B2A3BD5AB00E33F7A /* fast_obj.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 675D21BC1BFB8DBA00717E4F /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 34EBB47E1DBF52D3005BE9B8 /* common-debug.xcconfig */; + buildSettings = { + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; + }; + name = Debug; + }; + 675D21BD1BFB8DBA00717E4F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 34EBB47F1DBF52D3005BE9B8 /* common-release.xcconfig */; + buildSettings = { + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; + }; + name = Release; + }; + 675D21BF1BFB8DBA00717E4F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 675D21C01BFB8DBA00717E4F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 675D21B51BFB8DBA00717E4F /* Build configuration list for PBXProject "fast_obj" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 675D21BC1BFB8DBA00717E4F /* Debug */, + 675D21BD1BFB8DBA00717E4F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 675D21BE1BFB8DBA00717E4F /* Build configuration list for PBXNativeTarget "fast_obj" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 675D21BF1BFB8DBA00717E4F /* Debug */, + 675D21C01BFB8DBA00717E4F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 675D21B21BFB8DBA00717E4F /* Project object */; +} diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 168c39cefa..4d275fb090 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -48,6 +48,9 @@ + +