Merge pull request #1633 from JakeOShannessy/lua-api-update

Lua api update
firemodels · Jul 8, 2023 · d900fb7 · d900fb7
2 parents 1a05e42 + bbb1aa9
commit d900fb7
Show file tree

Hide file tree

Showing 22 changed files with 582 additions and 343 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,7 @@ Validation/*/FDS_Output_Files/*.csv
 # Build directory for CMake
 cbuild/
 dist/
+dist-debug/
 
 # Local config for some editors
 .vscode/
diff --git a/Build/smokeview/Makefile b/Build/smokeview/Makefile
@@ -117,7 +117,7 @@ SMVLUACORE_FILES = $(SMVLUACORE_DIR)/smv.lua $(SMVLUACORE_DIR)/ssf.lua \
 	$(SMVLUACORE_DIR)/unload.lua $(SMVLUACORE_DIR)/constants.lua \
 	$(SMVLUACORE_DIR)/gnuplot.lua $(SMVLUACORE_DIR)/plot.lua \
 	$(SMVLUACORE_DIR)/pl3d.lua \
-	$(SMVLUACORE_DIR)/camera.lua $(SMVLUACORE_DIR)/window.lua
+	$(SMVLUACORE_DIR)/camera.lua
 SMVLUALIB_FILES = $(LIB_DIR_PLAT)/lfs$(DYNLIB_EXT)
 
 smvluacore: $(SMVLUACORE_FILES) $(SMVLUALIB_FILES)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -317,7 +317,7 @@ if (LUA)
         Source/smvluacore/unload.lua Source/smvluacore/constants.lua
         Source/smvluacore/gnuplot.lua Source/smvluacore/plot.lua
         Source/smvluacore/pl3d.lua Source/smvluacore/json.lua
-        Source/smvluacore/camera.lua Source/smvluacore/window.lua
+        Source/smvluacore/camera.lua
     )
     install(
         FILES
@@ -330,8 +330,8 @@ if (LUA)
         Source/smvluacore/unload.lua Source/smvluacore/constants.lua
         Source/smvluacore/gnuplot.lua Source/smvluacore/plot.lua
         Source/smvluacore/pl3d.lua Source/smvluacore/json.lua
-        Source/smvluacore/camera.lua Source/smvluacore/window.lua
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/smokeview
+        Source/smvluacore/camera.lua
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/smokeview/scripts
     )
     if (VENDOR_LFS)
         add_subdirectory(Source/lfs)