Merge branch 'master' of https://github.com/MatthewBlanchard/glif int…

…o v2
MFEK · Mar 12, 2023 · 1c91f5e · 1c91f5e
2 parents aee1a5d + aaeb23d
commit 1c91f5e
Show file tree

Hide file tree

Showing 88 changed files with 6,722 additions and 4,401 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,8 +17,11 @@ build = "build.rs"
 #skulpin = { version = "0.10.0", default-features = false, features = ["skia_complete", "skulpin_winit"] }
 #skulpin = { path = "../skulpin", default-features = false, features = ["skia_complete", "skulpin_winit"] }
 #skulpin-plugin-imgui = { path = "../skulpin/skulpin-plugin-imgui" }
-skulpin = { git = "https://github.com/MFEK/skulpin" }
-skulpin-renderer = {git = "https://github.com/MFEK/skulpin/"}
+#skulpin = { git = "https://github.com/MFEK/skulpin" }
+#skulpin-renderer = {git = "https://github.com/MFEK/skulpin/"}
+gl = "0.14.0"
+skia-safe = { version = "0.53.0", features = ["gl"] }
+skia-bindings = "*"
 
 # For windowing, contexts, and events
 sdl2 = { version = ">=0.34", features = ["raw-window-handle"] }
@@ -33,11 +36,13 @@ msgbox = "0.6.1"
 lazy_static = "1.4"
 
 # For immediate mode GUI
-imgui = "0.7"
-imgui-sdl2 = "0.14"
-imgui-skia-renderer = {git = "https://github.com/MFEK/imgui-skia-renderer.rlib", branch = "main"}
+#imgui = "0.7"
+#imgui-sdl2 = "0.14"
+#imgui-skia-renderer = {git = "https://github.com/MFEK/imgui-skia-renderer.rlib", branch = "main"}
 #imgui-skia-renderer = { path = "../imgui-skia-renderer.rlib" } # for development
-
+egui = "0.21.0"
+egui_skia = "0.2.1"
+egui-sdl2-event = { git = "https://github.com/MFEK/egui-sdl2-event.rlib" }
 # For argument parsing
 clap = "3.0"
 
@@ -83,19 +88,19 @@ ctrlc = "3.2"
 
 ## Our crates
 # parses .glif files and gives us a place to put arbitrary data
-glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master", features=["skia", "mfek"] }
-#glifparser = { path = "../glifparser.rlib", features=["skia", "mfek"] } # for development
+#glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master", features=["skia", "mfek"] }
+glifparser = { path = "../glifparser.rlib", features=["skia", "mfek"] } # for development
 
-MFEKmath = { git = "https://github.com/MFEK/math.rlib", branch = "main" }
-#MFEKmath = { path = "../math.rlib" } # for development
+#MFEKmath = { git = "https://github.com/MFEK/math.rlib", branch = "main" }
+MFEKmath = { path = "../math.rlib" } # for development
 
 pub-mod = { git = "https://github.com/MFEK/pub_mod.rlib" }
 
-mfek-ipc = { git = "https://github.com/MFEK/ipc.rlib" }
-#mfek-ipc = { path = "../ipc.rlib" } # for development
+#mfek-ipc = { git = "https://github.com/MFEK/ipc.rlib" }
+mfek-ipc = { path = "../ipc.rlib" } # for development
 
-glifrenderer = { git = "https://github.com/MFEK/glifrenderer.rlib" }
-#glifrenderer = { path = "../glifrenderer.rlib" } # for development
+#glifrenderer = { git = "https://github.com/MFEK/glifrenderer.rlib" }
+glifrenderer = { path = "../glifrenderer.rlib" } # for development
 
 
 #xml parsing
@@ -120,7 +125,8 @@ flo_curves = "0.6"
 plist = "1.3"
 
 # we use this for affine matrices in some of our data types
-kurbo = {version = "0.8", features = ["serde"]}
+kurbo = {version = "0.9.0", features = ["serde"]}
+spline = {git="https://github.com/linebender/spline"}
 
 # show backtrace
 backtrace = "0.3"
@@ -134,7 +140,7 @@ cargo-emit = "0.2"
 cfg-if = "1.0"
 chrono = "0.4"
 colored = "2.0"
-git-version = "0.3"
+git-version = "0.3.0"
 log = "0.4"
 which = "4.2"
 

diff --git a/build.rs b/build.rs
@@ -7,8 +7,6 @@ extern crate cargo_emit;
 #[macro_use]
 extern crate git_version;
 
-use chrono;
-use log;
 use which::which;
 
 use std::process::Command;
@@ -19,10 +17,7 @@ fn main() {
             compile_error!("Features `sdl2-static` and `sdl2-dynamic` are mutually exclusive!");
         }
     }
-    let version = git_version!(
-        args = ["--tags", "--always", "--dirty=-desync"],
-        fallback = concat!("v", env!("CARGO_PKG_VERSION"))
-    );
+    let version = git_version!( args = ["--tags", "--always", "--dirty=-desync"], fallback = "v1" );
     rustc_env!("MFEK_VERSION", "{}", version);
     rustc_env!("MFEK_COMPILED_AT", "{}", chrono::Local::now().timestamp());
     #[cfg(all(target_os = "macos", feature = "sdl2-dynamic"))]

diff --git a/examples/M_.glif b/examples/M_.glif
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="M" format="2">
   <advance width="1085"/>
-  <unicode hex="004D"/>
+  <unicode hex="4D"/>
   <outline>
     <contour>
       <point x="955.505" y="598.147" type="line"/>
@@ -27,15 +27,9 @@
       <point x="766.271" y="86.0791" type="line"/>
     </contour>
     <contour>
-      <point x="809.412" y="95.666" type="move" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="809.412" y="95.666" type="move" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="632.01" y="148.394" type="move" smooth="yes"/>
-    </contour>
-    <contour>
+      <point x="764.784" y="305.438" type="curve" smooth="yes"/>
+      <point x="742.978" y="304.324"/>
+      <point x="721.758" y="294.312"/>
       <point x="707.034" y="278.188" type="curve"/>
       <point x="706.784" y="307.438" type="line"/>
       <point x="722" y="323.526"/>
@@ -47,9 +41,6 @@
       <point x="831.784" y="277.438" type="line"/>
       <point x="815.128" y="296.123"/>
       <point x="789.781" y="306.716"/>
-      <point x="764.784" y="305.438" type="curve" smooth="yes"/>
-      <point x="742.978" y="304.324"/>
-      <point x="721.758" y="294.312"/>
     </contour>
     <contour>
       <point x="707.034" y="448.25" type="line"/>
@@ -67,9 +58,6 @@
       <point x="722" y="402.912"/>
       <point x="706.784" y="419" type="curve"/>
     </contour>
-    <contour>
-      <point x="396.898" y="251.333" type="move" smooth="yes"/>
-    </contour>
     <contour>
       <point x="720.079" y="99.5625" type="line"/>
       <point x="691.414" y="99.5166" type="line"/>
@@ -139,6 +127,9 @@
       <point x="502.585" y="129.222" type="line"/>
     </contour>
     <contour>
+      <point x="441.784" y="305.438" type="curve" smooth="yes"/>
+      <point x="419.978" y="304.324"/>
+      <point x="398.758" y="294.312"/>
       <point x="384.034" y="278.188" type="curve"/>
       <point x="383.784" y="307.438" type="line"/>
       <point x="399" y="323.526"/>
@@ -150,9 +141,6 @@
       <point x="508.784" y="277.438" type="line"/>
       <point x="492.128" y="296.123"/>
       <point x="466.781" y="306.716"/>
-      <point x="441.784" y="305.438" type="curve" smooth="yes"/>
-      <point x="419.978" y="304.324"/>
-      <point x="398.758" y="294.312"/>
     </contour>
     <contour>
       <point x="384.034" y="448.25" type="line"/>
@@ -331,5 +319,16 @@
       <point x="57.9473" y="653.146"/>
       <point x="52" y="634.389" type="curve"/>
     </contour>
+    <contour>
+      <point x="-297" y="265" type="curve"/>
+      <point x="-303.66666" y="187"/>
+      <point x="-343.3333" y="168"/>
+      <point x="-416" y="208" type="curve"/>
+      <point x="-405.33334" y="252"/>
+      <point x="-371" y="272"/>
+      <point x="-371" y="272" type="curve"/>
+      <point x="-337.66666" y="296.66666"/>
+      <point x="-297" y="265"/>
+    </contour>
   </outline>
-</glyph>
+</glyph>