some more work

warmist · Jul 30, 2018 · b4b2430 · b4b2430
1 parent cafa78f
commit b4b2430
Show file tree

Hide file tree

Showing 8 changed files with 8,174 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 build
 .vs
 /CMakeSettings.json
+x64
+pixeldance.dir
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,10 +31,11 @@ message(STATUS OPENMP: ${MSVC_OPENMP_DIR})
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(SOURCES
+set(SRCS
   src/main.cpp
   src/imgui-SFML.cpp
   src/filesys.cpp
+  src/limgui.cpp
   ${IMGUI}/imgui.cpp
   ${IMGUI}/imgui_draw.cpp
   ${IMGUI}/imgui_demo.cpp
@@ -44,6 +45,9 @@ set(HDRS
   src/imconfig-SFML.h
   src/imgui-SFML.h
   src/filesys.h
+  src/limgui.h
+  src/stb_image.h
+  src/stb_image_write.h
   ${LUA}/lua.hpp
   ${LUA}/lualib.h
 )
@@ -54,7 +58,7 @@ INCLUDE_DIRECTORIES(${IMGUI})
 INCLUDE_DIRECTORIES(${LUA})
 
 add_executable(${TARGET_NAME}
-  ${SOURCES} ${HDRS}
+  ${SRCS} ${HDRS}
 )
 
 target_link_libraries(${TARGET_NAME}  ${SFML_LIBRARIES} ${SFML_DEPENDENCIES} ${LUA}/lua51.lib)

diff --git a/projects/circle.lua b/projects/circle.lua
@@ -1,3 +1,11 @@
 for i=1,10 do
 	print(i)
+end
+color={0,0,0,0}
+
+function update(  )
+	imgui.Begin("Hello")
+	local changed
+	changed,color=imgui.ColorEdit3("thing",color)
+	imgui.End()
 end