Merge pull request #5 from antokhio/feat/revamp

Feat/revamp

.github/workflows/main.yml

@@ -1,6 +1,5 @@
 name: push_release_nuget
 
-# on push on master
 on:
   push:
     branches:
@@ -24,17 +23,11 @@ jobs:
         uses: nuget/setup-nuget@v1
 
       - name: Apply patch
-        run: git apply --ignore-whitespace shared-build.patch
-
-      - name: Build yogacore
-        uses: threeal/[email protected]
-        with:
-          source-dir: yoga\yoga
-          build-dir: out
+        run: git apply --ignore-whitespace .patch
 
       - name: Publish VL Nuget
         uses: vvvv/[email protected]
         with:
-          csproj: src\Vl.Yoga.csproj
+          csproj: src\VL.Yoga\Vl.Yoga.csproj
           nuspec: deployment\VL.Yoga.nuspec
           nuget-key: ${{ secrets.NUGET_KEY }}

.gitignore

@@ -8,6 +8,7 @@ out/
 # Build folder
 # lib/
 lib/
+runtimes/
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "yoga"]
-	path = yoga
-	url = git@github.com:facebook/yoga.git
+[submodule "src/YogaSharp"]
+	path = src/YogaSharp
+	url = https://github.com/Haselnussbomber/YogaSharp

.patch

@@ -0,0 +1,14 @@
+Submodule src/YogaSharp contains modified content
+diff --git a/src/YogaSharp/YogaSharp/Interop.cs b/src/YogaSharp/YogaSharp/Interop.cs
+index 159c044..ac0ba9c 100644
+--- a/src/YogaSharp/YogaSharp/Interop.cs
++++ b/src/YogaSharp/YogaSharp/Interop.cs
+@@ -4,7 +4,7 @@ namespace YogaSharp;
+
+ public static unsafe partial class Interop
+ {
+-    private const string yogacoredll = @"runtimes\win-x64\native\yogacore.dll";
++    private const string yogacoredll = "yogacore.dll";
+
+     /// <summary>
+     /// Returns the computed dimensions of the node, following the contraints of <paramref name="widthMode"/> and <paramref name="heightMode"/>:<br/>

README.md

@@ -1,34 +1,47 @@
 # VL.Yoga (WIP)
 
-Repositiry contins https://github.com/facebook/yoga implementation for [vvvv-gamma](https://visualprogramming.net/)
+Repository contains https://github.com/facebook/yoga implementation for [vvvv-gamma](https://visualprogramming.net/)  
+
+Based on @Haselnussbomber [YogaSharp](https://github.com/Haselnussbomber/YogaSharp/)  
+<sub>Uses small patch to align yogacore.dll path to vvvv runtimes folder.</sub>
+
+### Installation
+```
+nuget install VL.Yoga
+```
 
 ### This repo is in early WIP stage
 - [ ] Fix todos
 - [ ] Code cleanup
 - [ ] Nodes set
 - [ ] [Tests](https://github.com/facebook/yoga/tree/main/tests)
-- [ ] Nuget
-
-![test](https://github.com/antokhio/VL.Yoga/blob/develop/assets/test.jpg)
-
-### Installation
-```
-git clone
-build
-```
+- [x] Nuget
 
 ### Links
 https://www.yogalayout.dev/
+https://github.com/Haselnussbomber/YogaSharp/
 
+<details>
+  <summary>Additional links</summary>
+  https://github.com/bj-rn/VL.Flex-UI  
+  https://github.com/gilzoide/unity-flex-ui  
+  https://github.com/IceReaper/YogaSharp  
+</details>
 
 ### Credits
-```
-// Based on implementation by:
-@Haselnussbomber https://github.com/Haselnussbomber/YogaSharp/
 
-// Some stuff found useful:
-@gilzoide https://github.com/gilzoide/unity-flex-ui
-@IceReaper https://github.com/IceReaper/YogaSharp
+[@Haselnussbomber](https://github.com/Haselnussbomber) - for original yoga interop code.  
+[@bj-rn](https://github.com/bj-rn/) - for advice and help during early development stage.  
+[@antokhio](https://github.com/bj-rn/) - or spending a bit of time figuring that out.  
+
+Thank you guys for all the work.
+
+### Contributing
+```
+fork
+git checkout -b [feat|bug]/[name] // feat - for 'feature', bug for 'bug'
+git commit
+pr
 ```
 
-Thank you guys for all the hard work.
+![test](https://github.com/antokhio/VL.Yoga/blob/develop/assets/test.jpg)