Commit 0ac4cf8e authored by dylan grafmyre's avatar dylan grafmyre
Browse files

try to wait/sleep in gmod, it doesn't exist, going to do it badly with

lua soon
parent b76ff402
...@@ -24,7 +24,7 @@ VIS_BIN?=$(SUPERVISE_V_BIN) $(SUPERVISE_V_FLAGS) "'$(VBIN_DIR)vvis.exe'" ...@@ -24,7 +24,7 @@ VIS_BIN?=$(SUPERVISE_V_BIN) $(SUPERVISE_V_FLAGS) "'$(VBIN_DIR)vvis.exe'"
VIS_FLAGS?=$(VBIN_FLAGS) -fast VIS_FLAGS?=$(VBIN_FLAGS) -fast
RAD_BIN?=$(SUPERVISE_V_BIN) $(SUPERVISE_V_FLAGS) "'$(VBIN_DIR)vrad.exe'" RAD_BIN?=$(SUPERVISE_V_BIN) $(SUPERVISE_V_FLAGS) "'$(VBIN_DIR)vrad.exe'"
RAD_FLAGS?=$(VBIN_FLAGS) -StaticPropLighting -bounce 2 -noextra RAD_FLAGS?=$(VBIN_FLAGS) -StaticPropLighting -bounce 2 -noextra
# -StaticPropSampleScale 0.25 # -StaticPropSampleScale 0.25
BSPZIP_BIN?=$(SUPERVISE_V_BIN) $(SUPERVISE_V_FLAGS) "'$(VBIN_DIR)bspzip.exe'" BSPZIP_BIN?=$(SUPERVISE_V_BIN) $(SUPERVISE_V_FLAGS) "'$(VBIN_DIR)bspzip.exe'"
BSPZIP_FLAGS?=$(VBIN_FLAGS) BSPZIP_FLAGS?=$(VBIN_FLAGS)
GMAD_BIN?="$(VBIN_DIR)gmad.exe" GMAD_BIN?="$(VBIN_DIR)gmad.exe"
...@@ -46,7 +46,7 @@ MOUNT_BIN?=$(PYTHON_BIN) ./contrib/mount ...@@ -46,7 +46,7 @@ MOUNT_BIN?=$(PYTHON_BIN) ./contrib/mount
MOUNT_FLAGS?=--mod-dir "'$(MOD_DIR)'" MOUNT_FLAGS?=--mod-dir "'$(MOD_DIR)'"
%_p.bsp: %.bsp %_p.bsp: %.bsp
$(BSPZIP_BIN) -addlist $^ $(^:.bsp=.bspzip-addlist) $@ $(BSPZIP_FLAGS) $(BSPZIP_BIN) -addlist $^ $(^:.bsp=.bspzip-addlist) $@ $(BSPZIP_FLAGS)
cp $@ $(MOUNT_DIR)maps\\$(notdir $@) cp $@ $(MOUNT_DIR)maps\\$(notdir $@)
%.bspzip-addlist: %.vmf %.bspzip-addlist: %.vmf
...@@ -56,18 +56,18 @@ MOUNT_FLAGS?=--mod-dir "'$(MOD_DIR)'" ...@@ -56,18 +56,18 @@ MOUNT_FLAGS?=--mod-dir "'$(MOD_DIR)'"
ifeq ($(GAME),0) ifeq ($(GAME),0)
echo "user disabled run game via GAME=0" echo "user disabled run game via GAME=0"
else else
$(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) +ttt_preptime_seconds 3 +ttt_firstpreptime_seconds 3 +gamemode terrortown +ttt_debug_preventwin 1 +ttt_minimum_players 1 +map $(notdir $(basename $^)) $(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) +mat_specular 1 +ttt_preptime_seconds 3 +ttt_firstpreptime_seconds 3 +gamemode terrortown +ttt_debug_preventwin 1 +ttt_minimum_players 1 +map $(notdir $(basename $^))
endif endif
%.game-mount: addons/%/.mount %.game-mount: addons/%/.mount
ifeq ($(GAME),0) ifeq ($(GAME),0)
echo "user disabled run game via GAME=0" echo "user disabled run game via GAME=0"
else else
$(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) +ttt_preptime_seconds 3 +ttt_firstpreptime_seconds 3 +gamemode terrortown +ttt_debug_preventwin 1 +ttt_minimum_players 1 +map $(notdir $(^:/.mount=)) $(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) +mat_specular 1 +ttt_preptime_seconds 3 +ttt_firstpreptime_seconds 3 +gamemode terrortown +ttt_debug_preventwin 1 +ttt_minimum_players 1 +map $(notdir $(^:/.mount=))
endif endif
%.game-only: %.game-only:
$(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) +ttt_preptime_seconds 3 +ttt_firstpreptime_seconds 3 +gamemode terrortown +ttt_debug_preventwin 1 +ttt_minimum_players 1 +map $(notdir $(basename $@)) $(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) +mat_specular 1 +ttt_preptime_seconds 3 +ttt_firstpreptime_seconds 3 +gamemode terrortown +ttt_debug_preventwin 1 +ttt_minimum_players 1 +map $(notdir $(basename $@))
maps/%.bsp: %.bsp maps/%.bsp: %.bsp
...@@ -85,7 +85,7 @@ maps/%.bsp: %.bsp ...@@ -85,7 +85,7 @@ maps/%.bsp: %.bsp
# fast # fast
$(BSP_BIN) $(VBIN_FLAGS) $(basename $^) $(BSP_BIN) $(VBIN_FLAGS) $(basename $^)
$(VIS_BIN) -fast $(VBIN_FLAGS) $(basename $^) $(VIS_BIN) -fast $(VBIN_FLAGS) $(basename $^)
$(RAD_BIN) -bounce 2 -noextra $(VBIN_FLAGS) $(basename $^) $(RAD_BIN) -bounce 2 -noextra $(VBIN_FLAGS) $(basename $^)
mv $(@:_fast.bsp=.bsp) $@ mv $(@:_fast.bsp=.bsp) $@
$(GEN_BSPZIP_ADDLIST_BIN) $(GEN_BSPZIP_ADDLIST_FLAGS) $^ > $(@:.bsp=.bspzip-addlist) $(GEN_BSPZIP_ADDLIST_BIN) $(GEN_BSPZIP_ADDLIST_FLAGS) $^ > $(@:.bsp=.bspzip-addlist)
...@@ -111,10 +111,10 @@ maps/%.bsp: %.bsp ...@@ -111,10 +111,10 @@ maps/%.bsp: %.bsp
+sv_cheats 1 +buildcubemaps +disconnect +mat_specular 1 +quit +sv_cheats 1 +buildcubemaps +disconnect +mat_specular 1 +quit
%.cubehdr: %.bsp %.cubehdr: %.bsp
$(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) \ $(SHLEX_BIN) $(SHLEX_FLAGS) "'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) \
+mat_specular 0 +map $(notdir $(basename $^)) \ +mat_specular 0 +map $(notdir $(basename $^)) +lua_openscript helloworld.lua \
+sv_cheats 1 +buildcubemaps +disconnect +sv_cheats 0 \ +sv_cheats 1 +buildcubemaps +lua_openscript helloworld.lua +disconnect +sv_cheats 0 \
+mat_hdr_level 0 +map $(notdir $(basename $^)) \ +mat_hdr_level 0 +map $(notdir $(basename $^)) +lua_openscript helloworld.lua \
+sv_cheats 1 +buildcubemaps +disconnect +mat_specular 1 +quit +sv_cheats 1 +buildcubemaps +lua_openscript helloworld.lua +disconnect +mat_specular 1 +quit
# only ents works on an existing bsp, # only ents works on an existing bsp,
# which are not typically left "in place" for this operation # which are not typically left "in place" for this operation
...@@ -125,7 +125,7 @@ maps/%.bsp: %.bsp ...@@ -125,7 +125,7 @@ maps/%.bsp: %.bsp
# create gma files for publishing # create gma files for publishing
# testing requirest then extracting the gma and mounting it via # testing requirest then extracting the gma and mounting it via
# Garrysmod/garrysmod/cfg/mount.cfg # Garrysmod/garrysmod/cfg/mount.cfg
# #
# todo: pack bsp-zip list with gma instead (non _p variants? only) # todo: pack bsp-zip list with gma instead (non _p variants? only)
...@@ -172,7 +172,7 @@ addons/%/.mount: addons/%/.d ...@@ -172,7 +172,7 @@ addons/%/.mount: addons/%/.d
# cp -var addons/*.gma $(MOD_DIR)/addons/ # cp -var addons/*.gma $(MOD_DIR)/addons/
publish: addons/ttt_terrorcon_v2_hdr_final.gma publish: addons/ttt_terrorcon_v2_hdr_final.gma
$(SHLEX_BIN) $(SHLEX_FLAGS) $(GMPUBLISH_BIN) $(GMPUBLISH_FLAGS) -icon "'C:\\hammer\\ttt_terrorcon\\addons\\512x512.jpg'" -addon "$^" $(SHLEX_BIN) $(SHLEX_FLAGS) $(GMPUBLISH_BIN) $(GMPUBLISH_FLAGS) -icon "'C:\\hammer\\ttt_terrorcon\\addons\\512x512.jpg'" -addon "$^"
# custom rules # custom rules
......
function wait(time)
local duration = os.time() + time
while os.time() < duration do end
end
print( "Hello world before" )
print( os.time() )
wait(1000)
print( "Hello world after" )
print( os.time() )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment