Merge branch 'release/1.1.1'

ctreffs · Jan 13, 2020 · 91cec05 · 91cec05
2 parents e953ab1 + 2c7985a
commit 91cec05
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 99 deletions.
diff --git a/3rdparty/cimgui b/3rdparty/cimgui
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ copyLibImGui:
 	cp $(imgui_src)/generator/output/cimgui.cpp $(c_imgui_src)
 
 generateCInterface:
-	cd $(imgui_src)/generator && luajit ./generator.lua gcc glfw opengl3 opengl2 sdl
+	cd $(imgui_src)/generator && luajit ./generator.lua clang sdl glfw glut metal
 
 buildCImGui: updateCLibImGui generateCInterface copyLibImGui
 
@@ -47,6 +47,7 @@ runCI:
 
 wrapLibImGui: buildAutoWrapper
 	$(release_dir)/AutoWrapper $(imgui_src)/generator/output/definitions.json $(swift_imgui_src)/ImGui+Definitions.swift
+	#$(release_dir)/AutoWrapper $(imgui_src)/generator/output/impl_definitions.json $(swift_imgui_src)/ImGui+ImplDefinitions.swift
 
 clean:
 	swift package reset

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ import PackageDescription
 let package = Package(
     name: "YourPackageName",
     dependencies: [
-        .package(url: "https://github.com/ctreffs/SwiftImGui.git", from: "1.1.0")
+        .package(url: "https://github.com/ctreffs/SwiftImGui.git", from: "1.1.1")
     ],
     targets: [
         .target(

diff --git a/Sources/AutoWrapper/Definitions.swift b/Sources/AutoWrapper/Definitions.swift
@@ -150,11 +150,23 @@ public struct Definition: Decodable {
         var constructors: [ConstructorDef] = []
 
         if container.contains(.funcname) && !container.contains(.destructor) && !container.contains(.constructor) {
-            functions.insert(try FunctionDef(from: decoder))
+            do {
+                functions.insert(try FunctionDef(from: decoder))
+            } catch {
+                print("DECODING ERROR FunctionDef", decoder.codingPath, error.localizedDescription)
+            }
         } else if container.contains(.destructor) {
-            destructors.append(try DestructorDef(from: decoder))
+            do {
+                destructors.append(try DestructorDef(from: decoder))
+            } catch {
+                print("DECODING ERROR DestructorDef", decoder.codingPath, error.localizedDescription)
+            }
         } else if container.contains(.constructor) {
-            constructors.append(try ConstructorDef(from: decoder))
+            do {
+                constructors.append(try ConstructorDef(from: decoder))
+            } catch {
+                print("DECODING ERROR ConstructorDef", decoder.codingPath, error.localizedDescription)
+            }
         }
 
         self.functions = functions

diff --git a/Sources/AutoWrapper/main.swift b/Sources/AutoWrapper/main.swift
@@ -22,16 +22,18 @@ public func getDirectory(ofFile filePath: String = #file) -> String {
 }
 
 // Input: <SRC_ROOT>/3rdparty/cimgui/generator/output/definitions.json
-public let kInputFile: String
+public let kInputFiles: [String]
 // Output <SRC_ROOT>/Sources/ImGui/ImGui+Definitions.swift
-public let kOutputFile: String
+public let kOutputFiles: [String]
 
 if CommandLine.arguments.count == 3 {
-    kInputFile = CommandLine.arguments[1]
-    kOutputFile = CommandLine.arguments[2]
+    kInputFiles = [CommandLine.arguments[1]]
+    kOutputFiles = [CommandLine.arguments[2]]
 } else {
-    kInputFile = getDirectory() + "/../../3rdparty/cimgui/generator/output/definitions.json"
-    kOutputFile = getDirectory() + "/../ImGui/ImGui+Definitions.swift"
+    let src = getDirectory() + "/../../3rdparty/cimgui/generator/output/"
+    let dest = getDirectory() + "/../ImGui/"
+    kInputFiles = ["definitions.json"].map { "\(src)\($0)" }
+    kOutputFiles = ["ImGui+Definitions.swift"].map { "\(dest)\($0)" }
 }
 
 public let kHeader = """
@@ -52,14 +54,16 @@ import CImGui
 public let kFooter = """
 """
 
-try convert(filePath: kInputFile, validOnly: true) { body in
-    let out: String = [kHeader, body, kFooter].joined(separator: "\n\n")
+for (inputFile, outputFile) in zip(kInputFiles, kOutputFiles) {
+    try convert(filePath: inputFile, validOnly: true) { body in
+        let out: String = [kHeader, body, kFooter].joined(separator: "\n\n")
 
-    guard let data: Data = out.data(using: .utf8) else {
-        throw ConversionError(localizedDescription: "Could not generate data from output string \(out)")
-    }
+        guard let data: Data = out.data(using: .utf8) else {
+            throw ConversionError(localizedDescription: "Could not generate data from output string \(out)")
+        }
 
-    let outURL = URL(fileURLWithPath: kOutputFile)
+        let outURL = URL(fileURLWithPath: outputFile)
 
-    try data.write(to: outURL)
+        try data.write(to: outURL)
+    }
 }
diff --git a/Sources/CImGui/cimgui.cpp b/Sources/CImGui/cimgui.cpp
@@ -2,9 +2,10 @@
 //based on imgui.h file version "1.74 WIP" from Dear ImGui https://github.com/ocornut/imgui
 
 #include "./imgui/imgui.h"
+#include "./imgui/imgui_internal.h"
 #include "cimgui.h"
 
-#include "./imgui/imgui_internal.h"
+
 
 CIMGUI_API ImVec2* ImVec2_ImVec2(void)
 {