Attempt switch to imgui

blackhole89 · Jan 29, 2025 · 2c0ba65 · 2c0ba65
1 parent 98097a8
commit 2c0ba65
Show file tree

Hide file tree

Showing 7 changed files with 2,129 additions and 57 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,8 @@ include_directories(
     .
     llama.cpp/
     llama.cpp/common/
+    imgui/
+    imgui/backends/
 
 )
 
@@ -65,37 +67,55 @@ execute_process(COMMAND
     CL_TMP_VAR
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 string(STRIP ${CL_TMP_VAR} CL_VAR_4)
+execute_process(COMMAND 
+    pkg-config --cflags sdl2
+    OUTPUT_VARIABLE
+    CL_TMP_VAR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+string(STRIP ${CL_TMP_VAR} CL_VAR_5)
 add_definitions(${CL_VAR_1})
 add_definitions(${CL_VAR_2})
 add_definitions(${CL_VAR_3})
 add_definitions(${CL_VAR_4})
+add_definitions(${CL_VAR_5})
 add_definitions(-std=c++17)
 add_definitions(-g)
 add_definitions(-Wall)
-add_definitions(-O0)
+add_definitions(-Og)
+add_definitions(
+    -D_REENTRANT
+)
+
 
 # Linker options
 execute_process(COMMAND 
     pkg-config --libs gtkmm-3.0
     OUTPUT_VARIABLE
     CL_TMP_VAR
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(STRIP ${CL_TMP_VAR} CL_VAR_5)
+string(STRIP ${CL_TMP_VAR} CL_VAR_6)
 execute_process(COMMAND 
     pkg-config --libs gtksourceviewmm-3.0
     OUTPUT_VARIABLE
     CL_TMP_VAR
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(STRIP ${CL_TMP_VAR} CL_VAR_6)
+string(STRIP ${CL_TMP_VAR} CL_VAR_7)
 execute_process(COMMAND 
     pkg-config --libs jsoncpp
     OUTPUT_VARIABLE
     CL_TMP_VAR
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(STRIP ${CL_TMP_VAR} CL_VAR_7)
-set(LINK_OPTIONS ${CL_VAR_5})
-set(LINK_OPTIONS ${LINK_OPTIONS} ${CL_VAR_6})
+string(STRIP ${CL_TMP_VAR} CL_VAR_8)
+execute_process(COMMAND 
+    pkg-config --libs sdl2
+    OUTPUT_VARIABLE
+    CL_TMP_VAR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+string(STRIP ${CL_TMP_VAR} CL_VAR_9)
+set(LINK_OPTIONS ${CL_VAR_6})
 set(LINK_OPTIONS ${LINK_OPTIONS} ${CL_VAR_7})
+set(LINK_OPTIONS ${LINK_OPTIONS} ${CL_VAR_8})
+set(LINK_OPTIONS ${LINK_OPTIONS} ${CL_VAR_9})
 
 
 if(WIN32)
@@ -111,14 +131,21 @@ link_directories(
 
 # Define the CXX sources
 set ( CXX_SRCS
+    ${CMAKE_CURRENT_LIST_DIR}/editor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/imgui/backends/imgui_impl_opengl3.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/imgui/backends/imgui_impl_sdl2.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tokentree.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/imgui/imgui_widgets.cpp
     ${CMAKE_CURRENT_LIST_DIR}/main.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/mainwindow.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/imgui/imgui_demo.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/imgui/imgui.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/imgui/imgui_draw.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/imgui/imgui_tables.cpp
 )
 
 set_source_files_properties(
     ${CXX_SRCS} PROPERTIES COMPILE_FLAGS 
-    " -std=c++17 -pthread -pthread -g -Wall -O0")
+    " -std=c++17 -pthread -pthread -g -Wall -Og")
 
 if(WIN32)
     enable_language(RC)
@@ -138,8 +165,11 @@ target_link_libraries(autopen ${LINK_OPTIONS})
 target_link_libraries(autopen
     z
     fontconfig
-    llama
+    libllama.a
     libcommon.a
+    vulkan
+    gomp
+    GL
 )
 
 

diff --git a/autopen.project b/autopen.project
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Project Name="autopen" Version="11000" InternalType="GUI">
+  <VirtualDirectory Name="imgui">
+    <VirtualDirectory Name="backends">
+      <File Name="imgui/backends/imgui_impl_opengl3.cpp"/>
+      <File Name="imgui/backends/imgui_impl_opengl3.h"/>
+      <File Name="imgui/backends/imgui_impl_sdl2.h"/>
+      <File Name="imgui/backends/imgui_impl_sdl2.cpp"/>
+    </VirtualDirectory>
+    <File Name="imgui/imconfig.h"/>
+    <File Name="imgui/imgui.cpp"/>
+    <File Name="imgui/imgui.h"/>
+    <File Name="imgui/imgui_demo.cpp"/>
+    <File Name="imgui/imgui_draw.cpp"/>
+    <File Name="imgui/imgui_internal.h"/>
+    <File Name="imgui/imgui_tables.cpp"/>
+    <File Name="imgui/imgui_widgets.cpp"/>
+    <File Name="imgui/imstb_rectpack.h"/>
+    <File Name="imgui/imstb_textedit.h"/>
+    <File Name="imgui/imstb_truetype.h"/>
+  </VirtualDirectory>
   <Plugins>
     <Plugin Name="qmake">
       <![CDATA[00020001N0005Debug0000000000000001N0007Release000000000000]]>
@@ -8,27 +27,30 @@
   <Description/>
   <Dependencies/>
   <VirtualDirectory Name="include">
+    <File Name="editor.h"/>
     <File Name="tokentree.h"/>
-    <File Name="mainwindow.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="src">
+    <File Name="editor.cpp"/>
     <File Name="tokentree.cpp"/>
-    <File Name="mainwindow.cpp"/>
     <File Name="main.cpp"/>
   </VirtualDirectory>
   <Settings Type="Executable">
     <GlobalSettings>
-      <Compiler Options="-std=c++17;$(shell pkg-config --cflags gtkmm-3.0);$(shell pkg-config --cflags gtksourceviewmm-3.0);$(shell pkg-config --cflags jsoncpp);$(shell pkg-config --cflags fontconfig)" C_Options="" Assembler="">
+      <Compiler Options="-std=c++17;$(shell pkg-config --cflags gtkmm-3.0);$(shell pkg-config --cflags gtksourceviewmm-3.0);$(shell pkg-config --cflags jsoncpp);$(shell pkg-config --cflags fontconfig);$(shell pkg-config --cflags sdl2)" C_Options="" Assembler="">
         <IncludePath Value="."/>
       </Compiler>
-      <Linker Options="$(shell pkg-config --libs gtkmm-3.0);$(shell pkg-config --libs gtksourceviewmm-3.0);$(shell pkg-config --libs jsoncpp)">
+      <Linker Options="$(shell pkg-config --libs gtkmm-3.0);$(shell pkg-config --libs gtksourceviewmm-3.0);$(shell pkg-config --libs jsoncpp);$(shell pkg-config --libs sdl2)">
         <LibraryPath Value="."/>
         <LibraryPath Value="llama.cpp/"/>
         <LibraryPath Value="llama.cpp/common/"/>
         <Library Value="z"/>
         <Library Value="fontconfig"/>
         <Library Value="libllama.a"/>
         <Library Value="libcommon.a"/>
+        <Library Value="vulkan"/>
+        <Library Value="gomp"/>
+        <Library Value="GL"/>
       </Linker>
       <ResourceCompiler Options=""/>
     </GlobalSettings>
@@ -37,6 +59,8 @@
         <IncludePath Value="."/>
         <IncludePath Value="llama.cpp/"/>
         <IncludePath Value="llama.cpp/common/"/>
+        <IncludePath Value="imgui/"/>
+        <IncludePath Value="imgui/backends/"/>
       </Compiler>
       <Linker Options="" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
@@ -78,6 +102,8 @@
         <IncludePath Value="."/>
         <IncludePath Value="llama.cpp/"/>
         <IncludePath Value="llama.cpp/common/"/>
+        <IncludePath Value="imgui/"/>
+        <IncludePath Value="imgui/backends/"/>
         <Preprocessor Value="NDEBUG"/>
       </Compiler>
       <Linker Options="" Required="yes"/>