diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4e1d22d --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*~ +*# +*.blend1 +*.blend2 +*.log + diff --git a/history.txt b/history.txt index c78c433..4f328fe 100644 --- a/history.txt +++ b/history.txt @@ -2,3 +2,6 @@ maps map zombietest quit map zombietest +quit +maps +quit diff --git a/id1/maps/build.sh b/id1/maps/build.sh index 15dabd7..ff7aae5 100755 --- a/id1/maps/build.sh +++ b/id1/maps/build.sh @@ -1,13 +1,21 @@ #!/bin/bash -IN=./zombietest.map -OUT=zombietest.bsp DIR="$( cd -P "$( dirname "$0" )" && pwd )" -TOOLS_DIR=${DIR}/../../tools/ericw_tools +ROOT=${DIR}/../../ + +MAPNAME=zombietest +IN=${MAPNAME}.map +OUT=${MAPNAME}.bsp + +TOOLS_DIR=${ROOT}/tools/ericw_tools QBSP=${TOOLS_DIR}/qbsp VIS=${TOOLS_DIR}/vis LIGHT=${TOOLS_DIR}/light ${QBSP} ${IN} ${OUT} ${VIS} -fast -level 4 -noambient ${OUT} -${LIGHT} -soft -extra -extra4 ${OUT} +${LIGHT} -bounce -soft -extra -extra4 ${OUT} : +pushd ${ROOT} +./quakespasm-sdl2 +map ${MAPNAME} + +popd diff --git a/id1/maps/build.sh~ b/id1/maps/build.sh~ index 91523e5..72c669e 100755 --- a/id1/maps/build.sh~ +++ b/id1/maps/build.sh~ @@ -2,12 +2,19 @@ IN=./zombietest.map OUT=zombietest.bsp DIR="$( cd -P "$( dirname "$0" )" && pwd )" -TOOLS_DIR=${DIR}/../../tools/eric_tools +TOOLS_DIR=${DIR}/../../tools/ericw_tools QBSP=${TOOLS_DIR}/qbsp VIS=${TOOLS_DIR}/vis LIGHT=${TOOLS_DIR}/light ${QBSP} ${IN} ${OUT} ${VIS} -fast -level 4 -noambient ${OUT} -${LIGHT} -soft -extra -extra4 ${OUT} +${LIGHT} -bounce -soft -extra -extra4 ${OUT} : +#!/bin/bash +DIR="$( cd -P "$( dirname "$0" )" && pwd )" +ROOT=${DIR}/../../ +pushd ${ROOT} +./quakespasm-sdl2 +map zombietest + +popd diff --git a/id1/maps/light.log b/id1/maps/light.log index b6a6721..84e45a4 100644 --- a/id1/maps/light.log +++ b/id1/maps/light.log @@ -12,6 +12,7 @@ qdir: /opt/quakedev/ --- LoadEntities --- 7 entities read, 2 are lights. --- OptionsSummary --- + "bounce" was set to "1" from commandline Embree_TraceInit: Embree version: 2.17.5 Embree_TraceInit: 0 sky faces @@ -25,17 +26,21 @@ SetupLights: 2 after jittering 0....1....2....3....4....5 Final count: 2 lights, 0 suns in use. --- LightWorld --- +--- MakeTextureColors --- +--- MakeBounceLights --- +0....1....2....3....4....5....6....7....8....9... --- LightThread --- 0....1....2....3....4....5....6....7....8....9... +Indirect lights: 49 bounce lights, 0 surface lights (0 light points) in use. Lighting Completed. -lightdatasize: 4324 +lightdatasize: 5004 0 switchable light styles (32 max) Writing zombietest.bsp as BSP version 29 -0.016 seconds elapsed +0.053 seconds elapsed stats: 0.700207 lights tested, 0.623217 hits per sample point 0.000000 surface lights tested, 0.000000 hits per sample point -0.000000 bounce lights tested, 0.000000 hits per sample point +16.660215 bounce lights tested, 11.971556 hits per sample point 0 empty lightmaps diff --git a/id1/maps/run.sh b/id1/maps/run.sh index efd0850..4d2f816 100755 --- a/id1/maps/run.sh +++ b/id1/maps/run.sh @@ -2,6 +2,6 @@ DIR="$( cd -P "$( dirname "$0" )" && pwd )" ROOT=${DIR}/../../ pushd ${ROOT} -./quakespasm-sdl2 -map zombietest +./quakespasm-sdl2 +map zombietest popd diff --git a/id1/maps/run.sh~ b/id1/maps/run.sh~ index eb1e0d2..efd0850 100755 --- a/id1/maps/run.sh~ +++ b/id1/maps/run.sh~ @@ -2,6 +2,6 @@ DIR="$( cd -P "$( dirname "$0" )" && pwd )" ROOT=${DIR}/../../ pushd ${ROOT} -./quakespasm-sdl -map zombietest +./quakespasm-sdl2 -map zombietest popd diff --git a/id1/maps/zombietest.bsp b/id1/maps/zombietest.bsp index 4f77032..5fc6132 100644 Binary files a/id1/maps/zombietest.bsp and b/id1/maps/zombietest.bsp differ diff --git a/mod_mine/build.sh b/mod_mine/build.sh new file mode 100755 index 0000000..3d515fc --- /dev/null +++ b/mod_mine/build.sh @@ -0,0 +1,23 @@ +#!/bin/bash +DIR="$( cd -P "$( dirname "$0" )" && pwd )" +ROOT=${DIR}/../ + +MAPNAME=start +IN=${MAPNAME}.map +OUT=${MAPNAME}.bsp + +TOOLS_DIR=${ROOT}/tools/ericw_tools +QBSP=${TOOLS_DIR}/qbsp +VIS=${TOOLS_DIR}/vis +LIGHT=${TOOLS_DIR}/light + +pushd ${DIR}/maps +${QBSP} ${IN} ${OUT} +${VIS} -fast -level 4 -noambient ${OUT} +${LIGHT} -bounce -soft -extra -extra4 ${OUT} +popd + +pushd ${ROOT} +#./quakespasm-sdl2 +map ${MAPNAME} +./quakespasm-sdl2 +game mod_mine +popd diff --git a/mod_mine/config.cfg b/mod_mine/config.cfg new file mode 100644 index 0000000..b02bd5d --- /dev/null +++ b/mod_mine/config.cfg @@ -0,0 +1,139 @@ +unbindall +bind "TAB" "+showscores" +bind "ESCAPE" "togglemenu" +bind "SPACE" "+jump" +bind "+" "sizeup" +bind "," "+moveleft" +bind "-" "sizedown" +bind "." "+moveright" +bind "/" "impulse 10" +bind "0" "impulse 0" +bind "1" "impulse 1" +bind "2" "impulse 2" +bind "3" "impulse 3" +bind "4" "impulse 4" +bind "5" "impulse 5" +bind "6" "impulse 6" +bind "7" "impulse 7" +bind "8" "impulse 8" +bind "=" "sizeup" +bind "\" "+mlook" +bind "`" "toggleconsole" +bind "a" "+moveleft" +bind "c" "+movedown" +bind "d" "+moveright" +bind "e" "+moveup" +bind "s" "+back" +bind "t" "messagemode" +bind "w" "+forward" +bind "~" "toggleconsole" +bind "UPARROW" "+forward" +bind "DOWNARROW" "+back" +bind "LEFTARROW" "+left" +bind "RIGHTARROW" "+right" +bind "ALT" "+strafe" +bind "CTRL" "+attack" +bind "SHIFT" "+speed" +bind "F1" "help" +bind "F2" "menu_save" +bind "F3" "menu_load" +bind "F4" "menu_options" +bind "F5" "menu_multiplayer" +bind "F6" "echo Quicksaving...; wait; save quick" +bind "F9" "echo Quickloading...; wait; load quick" +bind "F10" "quit" +bind "F11" "zoom_in" +bind "F12" "screenshot" +bind "INS" "+klook" +bind "DEL" "+lookdown" +bind "PGDN" "+lookup" +bind "END" "centerview" +bind "MOUSE1" "+attack" +bind "MOUSE2" "+jump" +bind "MWHEELUP" "impulse 12" +bind "MWHEELDOWN" "impulse 10" +bind "LSHOULDER" "impulse 12" +bind "RSHOULDER" "impulse 10" +bind "LTRIGGER" "+jump" +bind "RTRIGGER" "+attack" +bind "PAUSE" "pause" +_cl_color "0" +_cl_name "player" +_snd_mixahead "0.1" +bgm_extmusic "1" +bgmvolume "1" +cfg_unbindall "1" +cl_alwaysrun "1" +cl_backspeed "200" +cl_forwardspeed "200" +cl_maxpitch "90" +cl_minpitch "-90" +contrast "1" +crosshair "0" +external_ents "1" +fov_adapt "1" +gamma "1.0" +gl_farclip "16384" +gl_flashblend "0" +gl_fullbrights "1" +gl_overbright "1" +gl_overbright_models "1" +gl_subdivide_size "128" +gl_texture_anisotropy "1" +gl_texturemode "GL_LINEAR_MIPMAP_LINEAR" +gl_triplebuffer "1" +host_maxfps "72" +joy_deadzone "0.175" +joy_deadzone_trigger "0.2" +joy_enable "1" +joy_exponent "3" +joy_exponent_move "3" +joy_invert "0" +joy_sensitivity_pitch "150" +joy_sensitivity_yaw "300" +joy_swapmovelook "0" +lookspring "0" +lookstrafe "0" +m_forward "1" +m_pitch "0.022" +m_side "0.8" +m_yaw "0.022" +r_clearcolor "2" +r_dynamic "1" +r_novis "0" +r_oldwater "0" +r_particles "1" +r_quadparticles "1" +r_scale "1" +r_shadows "0" +r_viewmodel_quake "0" +r_wateralpha "0.6" +saved1 "0" +saved2 "0" +saved3 "0" +saved4 "0" +savedgamecfg "0" +scr_conalpha "0.5" +scr_conscale "1.6" +scr_conspeed "500" +scr_conwidth "0" +scr_crosshairscale "1" +scr_menuscale "1.6" +scr_sbaralpha "0.75" +scr_sbarscale "1.6" +sensitivity "3" +sv_altnoclip "1" +sys_throttle "0.02" +vid_borderless "0" +vid_bpp "24" +vid_desktopfullscreen "0" +vid_fsaa "0" +vid_fullscreen "1" +vid_height "1080" +vid_refreshrate "60" +vid_vsync "0" +vid_width "1920" +viewsize "110" +volume "0.7" +vid_restart ++mlook diff --git a/mod_mine/maps/start.bsp b/mod_mine/maps/start.bsp new file mode 100644 index 0000000..2e7b0ba Binary files /dev/null and b/mod_mine/maps/start.bsp differ diff --git a/mod_mine/maps/start.map b/mod_mine/maps/start.map new file mode 100644 index 0000000..06363c7 --- /dev/null +++ b/mod_mine/maps/start.map @@ -0,0 +1,119 @@ +// Game: Quake +// Format: Standard +// entity 0 +{ +"classname" "worldspawn" +"wad" "/opt/quakedev/wads/start.wad;/opt/quakedev/wads/prototype_1_2.wad" +// brush 0 +{ +( -448 -64 -16 ) ( -448 -63 -16 ) ( -448 -64 -15 ) 128_grey_2 0 0 0 1 1 +( -64 -448 -16 ) ( -64 -448 -15 ) ( -63 -448 -16 ) 128_grey_2 0 0 0 1 1 +( -64 -64 -16 ) ( -63 -64 -16 ) ( -64 -63 -16 ) 128_grey_2 0 0 0 1 1 +( 64 64 0 ) ( 64 65 0 ) ( 65 64 0 ) 128_grey_2 0 0 0 1 1 +( 64 64 16 ) ( 65 64 16 ) ( 64 64 17 ) 128_grey_2 0 0 0 1 1 +( 64 64 16 ) ( 64 64 17 ) ( 64 65 16 ) 128_grey_2 0 0 0 1 1 +} +// brush 1 +{ +( -448 -64 192 ) ( -448 -63 192 ) ( -448 -64 193 ) 32_blue_3 0 -16 0 1 1 +( -64 -448 192 ) ( -64 -448 193 ) ( -63 -448 192 ) 32_blue_3 0 -16 0 1 1 +( -64 -64 192 ) ( -63 -64 192 ) ( -64 -63 192 ) 32_blue_3 0 0 0 1 1 +( 64 64 208 ) ( 64 65 208 ) ( 65 64 208 ) 32_blue_3 0 0 0 1 1 +( 64 64 224 ) ( 65 64 224 ) ( 64 64 225 ) 32_blue_3 0 -16 0 1 1 +( 64 64 224 ) ( 64 64 225 ) ( 64 65 224 ) 32_blue_3 0 -16 0 1 1 +} +// brush 2 +{ +( -448 432 -16 ) ( -448 433 -16 ) ( -448 432 -15 ) 128_grey_2 112 0 0 1 1 +( -64 64 -16 ) ( -64 64 -15 ) ( -63 64 -16 ) 128_grey_2 0 0 0 1 1 +( -64 432 -16 ) ( -63 432 -16 ) ( -64 433 -16 ) 128_grey_2 0 -112 0 1 1 +( 64 560 208 ) ( 64 561 208 ) ( 65 560 208 ) 128_grey_2 0 -112 0 1 1 +( 64 80 16 ) ( 65 80 16 ) ( 64 80 17 ) 128_grey_2 0 0 0 1 1 +( 64 560 16 ) ( 64 560 17 ) ( 64 561 16 ) 128_grey_2 112 0 0 1 1 +} +// brush 3 +{ +( -448 -96 -16 ) ( -448 -95 -16 ) ( -448 -96 -15 ) 128_grey_2 0 0 0 1 1 +( -64 -464 -16 ) ( -64 -464 -15 ) ( -63 -464 -16 ) 128_grey_2 0 0 0 1 1 +( -64 -96 -16 ) ( -63 -96 -16 ) ( -64 -95 -16 ) 128_grey_2 0 0 0 1 1 +( 64 32 208 ) ( 64 33 208 ) ( 65 32 208 ) 128_grey_2 0 0 0 1 1 +( 64 -448 16 ) ( 65 -448 16 ) ( 64 -448 17 ) 128_grey_2 0 0 0 1 1 +( 64 32 16 ) ( 64 32 17 ) ( 64 33 16 ) 128_grey_2 0 0 0 1 1 +} +// brush 4 +{ +( 64 -352 -16 ) ( 64 -352 -15 ) ( 64 -353 -16 ) 128_grey_2 0 0 180 1 -1 +( 560 -480 16 ) ( 560 -480 17 ) ( 561 -480 16 ) 128_grey_2 16 0 0 1 1 +( 432 -352 -16 ) ( 432 -353 -16 ) ( 433 -352 -16 ) 128_grey_2 0 -16 270 1 1 +( 560 -480 208 ) ( 561 -480 208 ) ( 560 -481 208 ) 128_grey_2 0 -16 270 1 1 +( 432 80 -16 ) ( 433 80 -16 ) ( 432 80 -15 ) 128_grey_2 16 0 0 1 1 +( 80 -480 16 ) ( 80 -481 16 ) ( 80 -480 17 ) 128_grey_2 0 0 180 1 -1 +} +// brush 5 +{ +( -464 -352 -16 ) ( -464 -352 -15 ) ( -464 -353 -16 ) 128_grey_2 0 0 180 1 -1 +( 32 -480 16 ) ( 32 -480 17 ) ( 33 -480 16 ) 128_grey_2 32 0 0 1 1 +( -96 -352 -16 ) ( -96 -353 -16 ) ( -95 -352 -16 ) 128_grey_2 0 -32 270 1 1 +( 32 -480 208 ) ( 33 -480 208 ) ( 32 -481 208 ) 128_grey_2 0 -32 270 1 1 +( -96 80 -16 ) ( -95 80 -16 ) ( -96 80 -15 ) 128_grey_2 32 0 0 1 1 +( -448 -480 16 ) ( -448 -481 16 ) ( -448 -480 17 ) 128_grey_2 0 0 180 1 -1 +} +// brush 6 +{ +( -80 -336 0 ) ( -80 -335 0 ) ( -80 -336 1 ) 128_grey_2 0 0 0 1 1 +( -80 -336 0 ) ( -80 -336 1 ) ( -79 -336 0 ) 128_grey_2 0 0 0 1 1 +( -80 -336 0 ) ( -79 -336 0 ) ( -80 -335 0 ) 128_grey_2 0 0 0 1 1 +( -32 -256 224 ) ( -32 -255 224 ) ( -31 -256 224 ) 128_grey_2 0 0 0 1 1 +( -32 -256 16 ) ( -31 -256 16 ) ( -32 -256 17 ) 128_grey_2 0 0 0 1 1 +( -32 -256 16 ) ( -32 -256 17 ) ( -32 -255 16 ) 128_grey_2 0 0 0 1 1 +} +// brush 7 +{ +( -192 -96 0 ) ( -192 -95 0 ) ( -192 -96 1 ) 128_grey_2 -112 0 0 1 1 +( -192 -96 0 ) ( -192 -96 1 ) ( -191 -96 0 ) 128_grey_2 112 0 0 1 1 +( -192 -96 0 ) ( -191 -96 0 ) ( -192 -95 0 ) 128_grey_2 112 112 0 1 1 +( -144 -16 224 ) ( -144 -15 224 ) ( -143 -16 224 ) 128_grey_2 112 112 0 1 1 +( -144 -16 16 ) ( -143 -16 16 ) ( -144 -16 17 ) 128_grey_2 112 0 0 1 1 +( -144 -16 16 ) ( -144 -16 17 ) ( -144 -15 16 ) 128_grey_2 -112 0 0 1 1 +} +// brush 8 +{ +( -320 -256 0 ) ( -320 -255 0 ) ( -320 -256 1 ) 128_grey_2 48 0 0 1 1 +( -320 -256 0 ) ( -320 -256 1 ) ( -319 -256 0 ) 128_grey_2 112 0 0 1 1 +( -320 -256 0 ) ( -319 -256 0 ) ( -320 -255 0 ) 128_grey_2 112 -48 0 1 1 +( -272 -176 224 ) ( -272 -175 224 ) ( -271 -176 224 ) 128_grey_2 112 -48 0 1 1 +( -272 -176 16 ) ( -271 -176 16 ) ( -272 -176 17 ) 128_grey_2 112 0 0 1 1 +( -272 -176 16 ) ( -272 -176 17 ) ( -272 -175 16 ) 128_grey_2 48 0 0 1 1 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "-224 -304 24" +} +// entity 2 +{ +"classname" "monster_knight" +"origin" "-368 -144 24" +} +// entity 3 +{ +"classname" "monster_wizard" +"origin" "0 -32 24" +} +// entity 4 +{ +"classname" "monster_zombie" +"origin" "-256 -96 24" +"angle" "270" +} +// entity 5 +{ +"classname" "light" +"origin" "-440 -216 152" +} +// entity 6 +{ +"classname" "light" +"origin" "56 -312 152" +} diff --git a/mod_mine/maps/start.prt b/mod_mine/maps/start.prt new file mode 100644 index 0000000..1c6e9f0 --- /dev/null +++ b/mod_mine/maps/start.prt @@ -0,0 +1,18 @@ +PRT1 +10 +15 +4 0 7 (-80 -176 192 ) (-144 -176 192 ) (-144 -176 0 ) (-80 -176 0 ) +4 0 4 (64 -176 0 ) (64 -176 192 ) (-80 -176 192 ) (-80 -176 0 ) +4 0 2 (-144 -96 0 ) (-144 -176 0 ) (-144 -176 192 ) (-144 -96 192 ) +4 0 1 (-144 64 192 ) (-144 64 0 ) (-144 -16 0 ) (-144 -16 192 ) +4 1 3 (-192 64 0 ) (-192 -16 0 ) (-192 -16 192 ) (-192 64 192 ) +4 2 7 (-192 -176 192 ) (-192 -176 0 ) (-144 -176 0 ) (-144 -176 192 ) +4 2 3 (-192 -96 0 ) (-192 -176 0 ) (-192 -176 192 ) (-192 -96 192 ) +4 3 8 (-448 -176 192 ) (-448 -176 0 ) (-320 -176 0 ) (-320 -176 192 ) +4 3 7 (-272 -176 0 ) (-192 -176 0 ) (-192 -176 192 ) (-272 -176 192 ) +4 4 7 (-80 -176 0 ) (-80 -256 0 ) (-80 -256 192 ) (-80 -176 192 ) +4 4 5 (-32 -256 0 ) (64 -256 0 ) (64 -256 192 ) (-32 -256 192 ) +4 5 6 (-32 -336 0 ) (64 -336 0 ) (64 -336 192 ) (-32 -336 192 ) +4 6 7 (-80 -336 0 ) (-80 -448 0 ) (-80 -448 192 ) (-80 -336 192 ) +4 7 9 (-272 -256 0 ) (-272 -448 0 ) (-272 -448 192 ) (-272 -256 192 ) +4 8 9 (-320 -256 192 ) (-448 -256 192 ) (-448 -256 0 ) (-320 -256 0 )