Skip to content

Commit 252484d

Browse files
AzzinothAzzinoth
committed
A lot of changes and fixes, which will be described in the release notes; Added GitHub Actions for testing purposes.
1 parent ff367bd commit 252484d

14 files changed

Lines changed: 594 additions & 194 deletions

‎.github/workflows/Build.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
runs-on: windows-latest
12+
strategy:
13+
matrix:
14+
build_type: [Debug, Release]
15+
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Checkout master branch
23+
run: git checkout master
24+
25+
# In order to build we need to use tests branch.
26+
- name: Copy files from master branch to temporary folder
27+
run: |
28+
mkdir "${{github.workspace}}\master_temp"
29+
30+
robocopy "${{github.workspace}}\" "${{github.workspace}}\master_temp" /NFL /E /XD "${{github.workspace}}\master_temp"
31+
# Robocopy will return 1 if successful, so we need to exit with 0 to avoid triggering a failure for this step
32+
if ($LastExitCode -eq 1) {
33+
echo "All files were copied successfully. Continuing..."
34+
exit 0
35+
} elseif ($LastExitCode -gt 7) {
36+
echo "An error occurred during file copying. Exiting..."
37+
exit $LastExitCode
38+
}
39+
40+
- name: Checkout tests branch
41+
run: |
42+
git checkout tests
43+
44+
- name: Copy master branch files from temporary folder to MasterBranchCode folder
45+
run: |
46+
robocopy "${{github.workspace}}\master_temp" "${{github.workspace}}\MasterBranchCode" /NFL /E
47+
# Robocopy will return 1 if successful, so we need to exit with 0 to avoid triggering a failure for this step
48+
if ($LastExitCode -eq 1) {
49+
echo "All files were copied successfully. Continuing..."
50+
exit 0
51+
} elseif ($LastExitCode -gt 7) {
52+
echo "An error occurred during file copying. Exiting..."
53+
exit $LastExitCode
54+
}
55+
56+
- name: Configure CMake
57+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
58+
59+
- name: Build
60+
run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build_type }}

‎.github/workflows/ContinuousIntegration.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: ContinuousIntegration
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
types: [opened, reopened, synchronize]
9+
10+
jobs:
11+
ContinuousIntegration:
12+
runs-on: windows-latest
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Checkout master branch
21+
run: git checkout master
22+
23+
- name: Copy files from master branch to temporary folder
24+
run: |
25+
mkdir "${{github.workspace}}\master_temp"
26+
27+
robocopy "${{github.workspace}}\" "${{github.workspace}}\master_temp" /NFL /E /XD "${{github.workspace}}\master_temp"
28+
# Robocopy will return 1 if successful, so we need to exit with 0 to avoid triggering a failure for this step
29+
if ($LastExitCode -eq 1) {
30+
echo "All files were copied successfully. Continuing..."
31+
exit 0
32+
} elseif ($LastExitCode -gt 7) {
33+
echo "An error occurred during file copying. Exiting..."
34+
exit $LastExitCode
35+
}
36+
37+
- name: Checkout tests branch
38+
run: git checkout tests
39+
40+
- name: Copy master branch files from temporary folder to MasterBranchCode folder
41+
run: |
42+
robocopy "${{github.workspace}}\master_temp" "${{github.workspace}}\MasterBranchCode" /NFL /E
43+
# Robocopy will return 1 if successful, so we need to exit with 0 to avoid triggering a failure for this step
44+
if ($LastExitCode -eq 1) {
45+
echo "All files were copied successfully. Continuing..."
46+
exit 0
47+
} elseif ($LastExitCode -gt 7) {
48+
echo "An error occurred during file copying. Exiting..."
49+
exit $LastExitCode
50+
}
51+
52+
- name: Configure CMake
53+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release
54+
55+
- name: Build
56+
run: cmake --build ${{github.workspace}}/build --config Release
57+
58+
- name: Ensure all files are in place
59+
run: |
60+
Move "${{github.workspace}}\build\Release\Visual_Node_System_Tests.exe" "${{github.workspace}}\Visual_Node_System_Tests.exe"
61+
62+
- name: Run test
63+
run: |
64+
$processStartInfo = New-Object System.Diagnostics.ProcessStartInfo
65+
$processStartInfo.FileName = "Visual_Node_System_Tests.exe"
66+
67+
Write-Host "Starting the executable..."
68+
$process = New-Object System.Diagnostics.Process
69+
$process.StartInfo = $processStartInfo
70+
$process.Start() | Out-Null
71+
Write-Host "Executable started."
72+
73+
Write-Host "Waiting for the process to exit..."
74+
$process.WaitForExit(10000) # 10 seconds
75+
if ($process.ExitCode -ne 0) {
76+
Write-Host "Some tests failed. Please check the test results."
77+
exit 1
78+
}
79+
80+
- name: Print additional test results if failed
81+
if: failure()
82+
run: |
83+
Get-Content "Results.xml" | ForEach-Object {
84+
Write-Host $_
85+
}

‎GroupComment.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,21 @@ void GroupComment::Draw() {}
5252

5353
Json::Value GroupComment::ToJson()
5454
{
55-
Json::Value result;
56-
57-
result["ID"] = ID;
58-
result["position"]["x"] = Position.x;
59-
result["position"]["y"] = Position.y;
60-
result["size"]["x"] = Size.x;
61-
result["size"]["y"] = Size.y;
62-
result["caption"] = Caption;
63-
result["bMoveElementsWithComment"] = bMoveElementsWithComment;
64-
result["BackgroundColor"]["x"] = BackgroundColor.x;
65-
result["BackgroundColor"]["y"] = BackgroundColor.y;
66-
result["BackgroundColor"]["z"] = BackgroundColor.z;
67-
result["BackgroundColor"]["w"] = BackgroundColor.w;
68-
69-
return result;
55+
Json::Value Result;
56+
57+
Result["ID"] = ID;
58+
Result["position"]["x"] = Position.x;
59+
Result["position"]["y"] = Position.y;
60+
Result["size"]["x"] = Size.x;
61+
Result["size"]["y"] = Size.y;
62+
Result["caption"] = Caption;
63+
Result["bMoveElementsWithComment"] = bMoveElementsWithComment;
64+
Result["BackgroundColor"]["x"] = BackgroundColor.x;
65+
Result["BackgroundColor"]["y"] = BackgroundColor.y;
66+
Result["BackgroundColor"]["z"] = BackgroundColor.z;
67+
Result["BackgroundColor"]["w"] = BackgroundColor.w;
68+
69+
return Result;
7070
}
7171

7272
void GroupComment::FromJson(Json::Value Json)

‎README.md‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
# Visual Node System
2-
3-
![build](https://github.com/Azzinoth/VisualNodeSystem-Example/actions/workflows/Build.yml/badge.svg?branch=master)
1+
<div align="center">
2+
<h1> Visual Node System </h1>
3+
<img src="https://github.com/Azzinoth/VisualNodeSystem/actions/workflows/Build.yml/badge.svg" alt="Build Status">
4+
<img src="https://github.com/Azzinoth/VisualNodeSystem/actions/workflows/ContinuousIntegration.yml/badge.svg" alt="Continuous Integration">
5+
</div>
46

57
This library provides a powerful framework for creating and managing visual node systems. These are typically used in graphical programming environments, game logic builders, and AI behavior tree editors.
68

9+
Master branch is free of tests to maintain its lightweightness. All test-related stuff (except GitHub Actions) is located in the [Tests Branch](https://github.com/Azzinoth/VisualNodeSystem/tree/tests)
10+
711
## Key Features
812

913
- **Unchanged Dear Imgui**: This project does not depend on modifications to Dear Imgui.
@@ -27,6 +31,11 @@ This library provides a powerful framework for creating and managing visual node
2731

2832
- **JSON Serialization**: The library provides functionalities to serialize/deserialize the node data to/from JSON format.
2933

34+
- **Integrated Copy/Paste**: With the help of JSON serialization/deserialization, elements can be copied from one node area to the same or another node area.
35+
<div align="center">
36+
<img src="https://github.com/Azzinoth/VisualNodeSystem/blob/media/Copy and Paste.gif" width="60%">
37+
</div>
38+
3039
- **Node Factory For Child Node Creation**: The library includes a system for creating child nodes using node factory, which enables JSON serialization of custom nodes.
3140

3241
- **Custom Context Menus**: The library supports the integration of custom context menus.

0 commit comments

Comments
 (0)