Merge branch 'main' of https://github.com/scarsty/node-editor

scarsty · Jan 27, 2022 · 7723904 · 7723904
2 parents 93c5c01 + 31a658c
commit 7723904
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,7 +86,7 @@ target_include_directories (${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/3rdparty
 target_include_directories (${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/3rdparty/imnodes)
 target_include_directories (${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/3rdparty/ImGuiFileDialog)
 
-target_link_libraries (${PROJECT_NAME} PRIVATE IMGUI glfw)
+target_link_libraries (${PROJECT_NAME} PRIVATE IMGUI)
 find_package(SDL2 REQUIRED)
 target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} PRIVATE ${SDL2_LIBRARIES})

diff --git a/cmake/imgui.cmake b/cmake/imgui.cmake
@@ -21,8 +21,8 @@ endif()
 #       Vulkan, Metal, OpenGL, WebGPU, DirectX
 macro (CHECK_PACKAGES)
     list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-    find_package(SDL2 REQUIRED)
-    find_package(glfw3 REQUIRED)
+    find_package(SDL2 QUIET)
+    find_package(glfw3 QUIET)
     find_package(Vulkan QUIET)
 endmacro()
 

diff --git a/nn-editor/ccccloader.h b/nn-editor/ccccloader.h
@@ -7,6 +7,6 @@ class ccccLoader : public NodeLoader
     virtual void fileToNodes(const std::string& filename, std::deque<Node>& nodes) override;
     virtual void nodesToFile(const std::deque<Node>& nodes, const std::string& filename) override;
     //virtual std::vector<std::string> efftiveKeys(const std::string& type) override;
-    virtual void refreshNodeValues(Node& n);
+    virtual void refreshNodeValues(Node& n) override;
 };
 
diff --git a/nn-editor/main.cpp b/nn-editor/main.cpp
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
     if (renderer == NULL)
     {
         SDL_Log("Error creating SDL_Renderer!");
-        return false;
+        return -1;
     }
 #endif
 

diff --git a/nn-editor/main.mm b/nn-editor/main.mm
@@ -11,32 +11,32 @@
 #import <Cocoa/Cocoa.h>
 
 namespace MacOSCode{
-char* openFile(){
-    @autoreleasepool {
-        id panl = [NSOpenPanel openPanel];
-        [panl setAllowsMultipleSelection:NO];
-        [panl setCanChooseDirectories:NO];
-        [panl setCanCreateDirectories:YES];
-        [panl setCanChooseFiles:YES];
-        if([panl runModal]==NSModalResponseOK){
-            NSString* filepath = [[[panl URLs] firstObject] path];
-            if(filepath){
-                if([filepath length] > 0){
-                    char* f = new char[[filepath length]]();
-                    memcpy(f, [filepath cStringUsingEncoding:NSUTF8StringEncoding], [filepath length]);
-                    return f;
+    char* openFile(){
+        @autoreleasepool {
+            id panl = [NSOpenPanel openPanel];
+            [panl setAllowsMultipleSelection:NO];
+            [panl setCanChooseDirectories:NO];
+            [panl setCanCreateDirectories:YES];
+            [panl setCanChooseFiles:YES];
+            if([panl runModal]==NSModalResponseOK){
+                NSString* filepath = [[[panl URLs] firstObject] path];
+                if(filepath){
+                    if([filepath length] > 0){
+                        char* f = new char[[filepath length]]();
+                        memcpy(f, [filepath cStringUsingEncoding:NSUTF8StringEncoding], [filepath length]);
+                        return f;
+                    }else{
+                        return NULL;
+                    }
                 }else{
                     return NULL;
                 }
             }else{
                 return NULL;
             }
-        }else{
-            return NULL;
         }
     }
 }
-}
 
 int main(int argc, char* argv[])
 {

diff --git a/nn-editor/nn_editor.cpp b/nn-editor/nn_editor.cpp
@@ -320,6 +320,7 @@ class ColorNodeEditor
         {
             filePathName =n;
         }
+        delete n;
         return filePathName;
 #else
         std::string filePathName;
@@ -361,8 +362,9 @@ class ColorNodeEditor
 
         // The node editor window
         std::string window_title = u8"Neural Net Editor";
-        ImGui::SetWindowSize(window_title.c_str(), ImGui::GetIO().DisplaySize);
         ImGui::Begin(window_title.c_str(), NULL, flags);
+        ImGui::SetWindowSize(window_title.c_str(), ImGui::GetIO().DisplaySize);
+        window_title.clear();
 
         //if (ImGui::)   //close window
         if (ImGui::BeginMenuBar())
@@ -476,6 +478,7 @@ class ColorNodeEditor
         //        emulate_three_button_mouse ? &ImGui::GetIO().KeyAlt : NULL;
         //}
         //ImGui::Columns(1);
+        ImNodes::BeginNodeEditor();
 
         {
             select_id_ = -1;
@@ -486,8 +489,6 @@ class ColorNodeEditor
             erase_select_ = 0;
         }
 
-        ImNodes::BeginNodeEditor();
-
         // Handle new nodes
         // These are driven by the user, so we place this code before rendering the nodes
         {
@@ -765,7 +766,6 @@ class ColorNodeEditor
             }
         }
         ImNodes::MiniMap(0.5f, minimap_location_);
-        ImNodes::EndNodeEditor();
 
         // Handle new links
         // These are driven by Imnodes, so we place the code after EndNodeEditor().
@@ -927,7 +927,8 @@ class ColorNodeEditor
         }
 
         //refresh_pos_link();
-
+
+        ImNodes::EndNodeEditor();
         ImGui::End();
         first_run_ = 0;
     }