diff options
| author | xolatile | 2025-07-19 16:01:38 +0200 |
|---|---|---|
| committer | xolatile | 2025-07-19 16:01:38 +0200 |
| commit | e9ad09c58820b31743251f793f30e5d4d49a0dca (patch) | |
| tree | f3e3afdf61301d6489f6777f03628e0ffe6c9b0f | |
| parent | c79dda69d6e603500a5681430172b5152041af0a (diff) | |
| download | xolatile-badassbug-e9ad09c58820b31743251f793f30e5d4d49a0dca.tar.xz xolatile-badassbug-e9ad09c58820b31743251f793f30e5d4d49a0dca.tar.zst | |
Rough changes...
591 files changed, 675 insertions, 649 deletions
@@ -7,3 +7,4 @@ src/shared/cube.h.gch src/sauer_client src/sauer_server bin_unix/* +packages/base/*.BAK diff --git a/data/default_map_settings.cfg b/data/default_map_settings.cfg index 706ee0a..589f650 100644 --- a/data/default_map_settings.cfg +++ b/data/default_map_settings.cfg @@ -10,15 +10,15 @@ if (strcmp $skybox "") [ ] materialreset -texture water "textures/water2.jpg" // water surface -texture 1 "textures/waterfall.jpg" // waterfall -texture 1 "textures/watern.jpg" // water normals -texture 1 "textures/waterdudv.jpg" // water distortion -texture 1 "textures/waterfalln.jpg" // waterfall normals -texture 1 "textures/waterfalldudv.jpg" // waterfall distortion +texture water "textures/water2.png" // water surface +texture 1 "textures/waterfall.png" // waterfall +texture 1 "textures/watern.png" // water normals +texture 1 "textures/waterdudv.png" // water distortion +texture 1 "textures/waterfalln.png" // waterfall normals +texture 1 "textures/waterfalldudv.png" // waterfall distortion -texture lava "textures/floor_lava2.jpg" 0 0 0 2 // lava surface -texture 1 "textures/floor_lava2.jpg" 0 0 0 2 // falling lava +texture lava "textures/floor_lava2.png" 0 0 0 2 // lava surface +texture 1 "textures/floor_lava2.png" 0 0 0 2 // falling lava // texture definitions for the map: texturereset // starts the texture slot/index at 0 diff --git a/data/game_fps.cfg b/data/game_fps.cfg index 9f9a7f1..1720ccc 100644 --- a/data/game_fps.cfg +++ b/data/game_fps.cfg @@ -3,7 +3,7 @@ togglezoom = [ zoom (if (= $zoom 1) -1 1) ] sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [sayteam $commandbuf] "[team]"] -mapcomplete = [ complete $arg1 packages/base ogz ] +mapcomplete = [ complete $arg1 packages/maps ogz ] mapcomplete map modenames = "ffa coop teamplay insta instateam effic efficteam" diff --git a/data/menus.cfg b/data/menus.cfg index c9e3bc8..e3840e5 100644 --- a/data/menus.cfg +++ b/data/menus.cfg @@ -113,7 +113,7 @@ showmapshot = [ guibar mname = (checkrolloveraction "map " [if (> $numargs 0) [result $arg1] [at $guirollovername 0]]) guilist [ - guiimage (concatword "packages/base/" $mname ".jpg") (checkrolloveraction "map ") 4 1 "data/cube.png" $mname + guiimage (concatword "packages/maps/" $mname ".png") (checkrolloveraction "map ") 4 1 "data/cube.png" $mname ] ] @@ -268,7 +268,7 @@ newgui custommaps [ ] "custom maps" showcustommaps = [ custommaps = "" - loopfiles curmap "packages/base" "ogz" [ + loopfiles curmap "packages/maps" "ogz" [ if (< (indexof $allmaps $curmap) 0) [ custommaps = (concat $custommaps (escape $curmap)) ] @@ -583,19 +583,13 @@ guitab "ents" ////////////////////////////////////////////////////////////////// guilist [ guibutton "light..^t^t^t^t^t" "resetlight;showgui newlight" guibutton "playerstart" "newent playerstart" - guibutton "base" "newent base" - guibutton "trigger.." "showgui triggers" ] guilist [ guibutton "mapmodel..^t^t^f2[F4]^t^t" "showgui mapmodels" guibutton "playerstart team-1" "newent playerstart 1" - guibutton "flag team-1" "newent flag 1" - guibutton "monster.." "showgui monsters" ] guilist [ guibutton "teleport.." "showgui newteleport" - guibutton "playerstart team-2" "newent playerstart 2" - guibutton "flag team-2" "newent flag 2" ] ] guitext "pickup entities:" @@ -609,6 +603,8 @@ guitab "ents" ////////////////////////////////////////////////////////////////// guibutton "cartridges" "newent cartridges" ] guilist [ + guibutton "tinyhealth" "newent tinyhealth" + guibutton "tinyarmour" "newent tinyarmour" guibutton "health" "newent health" guibutton "healthboost" "newent healthboost" guibutton "greenarmour" "newent greenarmour" @@ -661,17 +657,13 @@ guitab "cloudlayer" //////////////////////////////////////////////////////////// guilist [ guilist [ guitext "cloudlayer^t^t^t^t^t^t" - guibutton "skyboxes/clouds01.png" [cloudlayer "skyboxes/clouds01.png"] - guibutton "skyboxes/clouds02.png" [cloudlayer "skyboxes/clouds02.png"] - guibutton "skyboxes/clouds03.png" [cloudlayer "skyboxes/clouds03.png"] - guibutton "skyboxes/white_bk.jpg" [cloudlayer "skyboxes/white_bk.jpg"] + guibutton "clouds/clouds01.png" [cloudlayer "clouds/clouds01.png"] + guibutton "clouds/clouds02.png" [cloudlayer "clouds/clouds02.png"] + guibutton "clouds/clouds03.png" [cloudlayer "clouds/clouds03.png"] ] guilist [ - guibutton "*no clouds*" [cloudlayer ""] - guibutton "blindabuser/blindaclouds.png" [cloudlayer "blindabuser/blindaclouds.png"] - guibutton "skyboxes/cloud_ring.png" [cloudlayer "skyboxes/cloud_ring.png"] - guibutton "textures/razgriz/cloud03.png" [cloudlayer "textures/razgriz/cloud03.png"] - guibutton "textures/razgriz/cloud04.png" [cloudlayer "textures/razgriz/cloud04.png"] + guibutton "*no clouds*" [cloudlayer ""] + guibutton "clouds/cloud_ring.png" [cloudlayer "clouds/cloud_ring.png"] ] ] ] diff --git a/packages/clouds/cloud_ring.png b/packages/clouds/cloud_ring.png Binary files differnew file mode 100644 index 0000000..f8e5d40 --- /dev/null +++ b/packages/clouds/cloud_ring.png diff --git a/packages/clouds/clouds01.png b/packages/clouds/clouds01.png Binary files differnew file mode 100644 index 0000000..0310ec1 --- /dev/null +++ b/packages/clouds/clouds01.png diff --git a/packages/clouds/clouds02.png b/packages/clouds/clouds02.png Binary files differnew file mode 100644 index 0000000..af51a55 --- /dev/null +++ b/packages/clouds/clouds02.png diff --git a/packages/clouds/clouds03.png b/packages/clouds/clouds03.png Binary files differnew file mode 100644 index 0000000..4946c04 --- /dev/null +++ b/packages/clouds/clouds03.png diff --git a/packages/icons/action.jpg b/packages/icons/action.jpg Binary files differdeleted file mode 100644 index ad1d939..0000000 --- a/packages/icons/action.jpg +++ /dev/null diff --git a/packages/icons/action.png b/packages/icons/action.png Binary files differnew file mode 100644 index 0000000..227f965 --- /dev/null +++ b/packages/icons/action.png diff --git a/packages/icons/arrow_bw.jpg b/packages/icons/arrow_bw.jpg Binary files differdeleted file mode 100644 index de4e6a1..0000000 --- a/packages/icons/arrow_bw.jpg +++ /dev/null diff --git a/packages/icons/arrow_bw.png b/packages/icons/arrow_bw.png Binary files differnew file mode 100644 index 0000000..1e68f9a --- /dev/null +++ b/packages/icons/arrow_bw.png diff --git a/packages/icons/arrow_fw.jpg b/packages/icons/arrow_fw.jpg Binary files differdeleted file mode 100644 index f5db5f4..0000000 --- a/packages/icons/arrow_fw.jpg +++ /dev/null diff --git a/packages/icons/arrow_fw.png b/packages/icons/arrow_fw.png Binary files differnew file mode 100644 index 0000000..93b58b6 --- /dev/null +++ b/packages/icons/arrow_fw.png diff --git a/packages/icons/checkbox_off.jpg b/packages/icons/checkbox_off.png Binary files differindex c7ce9c2..0db22cc 100644 --- a/packages/icons/checkbox_off.jpg +++ b/packages/icons/checkbox_off.png diff --git a/packages/icons/checkbox_on.jpg b/packages/icons/checkbox_on.png Binary files differindex 0a649e4..bdf89ab 100644 --- a/packages/icons/checkbox_on.jpg +++ b/packages/icons/checkbox_on.png diff --git a/packages/icons/cube.jpg b/packages/icons/cube.jpg Binary files differdeleted file mode 100644 index f4e84b1..0000000 --- a/packages/icons/cube.jpg +++ /dev/null diff --git a/packages/icons/cube.png b/packages/icons/cube.png Binary files differnew file mode 100644 index 0000000..a47f634 --- /dev/null +++ b/packages/icons/cube.png diff --git a/packages/icons/exit.jpg b/packages/icons/exit.jpg Binary files differdeleted file mode 100644 index 26dbd58..0000000 --- a/packages/icons/exit.jpg +++ /dev/null diff --git a/packages/icons/exit.png b/packages/icons/exit.png Binary files differnew file mode 100644 index 0000000..a7a9877 --- /dev/null +++ b/packages/icons/exit.png diff --git a/packages/icons/info.jpg b/packages/icons/info.jpg Binary files differdeleted file mode 100644 index 47564e5..0000000 --- a/packages/icons/info.jpg +++ /dev/null diff --git a/packages/icons/info.png b/packages/icons/info.png Binary files differnew file mode 100644 index 0000000..f2f604f --- /dev/null +++ b/packages/icons/info.png diff --git a/packages/icons/menu.jpg b/packages/icons/menu.jpg Binary files differdeleted file mode 100644 index f5db5f4..0000000 --- a/packages/icons/menu.jpg +++ /dev/null diff --git a/packages/icons/menu.png b/packages/icons/menu.png Binary files differnew file mode 100644 index 0000000..93b58b6 --- /dev/null +++ b/packages/icons/menu.png diff --git a/packages/icons/mrfixit.jpg b/packages/icons/mrfixit.jpg Binary files differdeleted file mode 100644 index b42b4a5..0000000 --- a/packages/icons/mrfixit.jpg +++ /dev/null diff --git a/packages/icons/mrfixit.png b/packages/icons/mrfixit.png Binary files differnew file mode 100644 index 0000000..491eeff --- /dev/null +++ b/packages/icons/mrfixit.png diff --git a/packages/icons/mrfixit_blue.jpg b/packages/icons/mrfixit_blue.jpg Binary files differdeleted file mode 100644 index d8c6f08..0000000 --- a/packages/icons/mrfixit_blue.jpg +++ /dev/null diff --git a/packages/icons/mrfixit_blue.png b/packages/icons/mrfixit_blue.png Binary files differnew file mode 100644 index 0000000..f7a33a2 --- /dev/null +++ b/packages/icons/mrfixit_blue.png diff --git a/packages/icons/mrfixit_red.jpg b/packages/icons/mrfixit_red.jpg Binary files differdeleted file mode 100644 index bed66ac..0000000 --- a/packages/icons/mrfixit_red.jpg +++ /dev/null diff --git a/packages/icons/mrfixit_red.png b/packages/icons/mrfixit_red.png Binary files differnew file mode 100644 index 0000000..fe36fc6 --- /dev/null +++ b/packages/icons/mrfixit_red.png diff --git a/packages/icons/radio_off.jpg b/packages/icons/radio_off.png Binary files differindex c223687..e70b263 100644 --- a/packages/icons/radio_off.jpg +++ b/packages/icons/radio_off.png diff --git a/packages/icons/radio_on.jpg b/packages/icons/radio_on.png Binary files differindex 62f4a72..7c0c8ce 100644 --- a/packages/icons/radio_on.jpg +++ b/packages/icons/radio_on.png diff --git a/packages/icons/sauer.jpg b/packages/icons/sauer.jpg Binary files differdeleted file mode 100644 index 079a6d5..0000000 --- a/packages/icons/sauer.jpg +++ /dev/null diff --git a/packages/icons/sauer.png b/packages/icons/sauer.png Binary files differnew file mode 100644 index 0000000..5937000 --- /dev/null +++ b/packages/icons/sauer.png diff --git a/packages/icons/server.jpg b/packages/icons/server.jpg Binary files differdeleted file mode 100644 index 49b7263..0000000 --- a/packages/icons/server.jpg +++ /dev/null diff --git a/packages/icons/server.png b/packages/icons/server.png Binary files differnew file mode 100644 index 0000000..22b7c4f --- /dev/null +++ b/packages/icons/server.png diff --git a/packages/icons/serverfull.jpg b/packages/icons/serverfull.jpg Binary files differdeleted file mode 100644 index 4db50f8..0000000 --- a/packages/icons/serverfull.jpg +++ /dev/null diff --git a/packages/icons/serverfull.png b/packages/icons/serverfull.png Binary files differnew file mode 100644 index 0000000..6b7cf6e --- /dev/null +++ b/packages/icons/serverfull.png diff --git a/packages/icons/serverlock.jpg b/packages/icons/serverlock.jpg Binary files differdeleted file mode 100644 index da9ad8b..0000000 --- a/packages/icons/serverlock.jpg +++ /dev/null diff --git a/packages/icons/serverlock.png b/packages/icons/serverlock.png Binary files differnew file mode 100644 index 0000000..8a650cd --- /dev/null +++ b/packages/icons/serverlock.png diff --git a/packages/icons/serverpriv.jpg b/packages/icons/serverpriv.jpg Binary files differdeleted file mode 100644 index afc6896..0000000 --- a/packages/icons/serverpriv.jpg +++ /dev/null diff --git a/packages/icons/serverpriv.png b/packages/icons/serverpriv.png Binary files differnew file mode 100644 index 0000000..f240bab --- /dev/null +++ b/packages/icons/serverpriv.png diff --git a/packages/icons/serverunk.jpg b/packages/icons/serverunk.jpg Binary files differdeleted file mode 100644 index c9ab7e5..0000000 --- a/packages/icons/serverunk.jpg +++ /dev/null diff --git a/packages/icons/serverunk.png b/packages/icons/serverunk.png Binary files differnew file mode 100644 index 0000000..9320e36 --- /dev/null +++ b/packages/icons/serverunk.png diff --git a/packages/icons/spectator.jpg b/packages/icons/spectator.jpg Binary files differdeleted file mode 100644 index b7eefc8..0000000 --- a/packages/icons/spectator.jpg +++ /dev/null diff --git a/packages/icons/spectator.png b/packages/icons/spectator.png Binary files differnew file mode 100644 index 0000000..a0a3e69 --- /dev/null +++ b/packages/icons/spectator.png diff --git a/packages/base/.gitkeep b/packages/maps/.gitkeep index e69de29..e69de29 100644 --- a/packages/base/.gitkeep +++ b/packages/maps/.gitkeep diff --git a/packages/maps/furiousheights3.ogz b/packages/maps/furiousheights3.ogz Binary files differnew file mode 100644 index 0000000..88f537f --- /dev/null +++ b/packages/maps/furiousheights3.ogz diff --git a/packages/maps/highland.ogz b/packages/maps/highland.ogz Binary files differnew file mode 100644 index 0000000..758d153 --- /dev/null +++ b/packages/maps/highland.ogz diff --git a/packages/maps/ztn.ogz b/packages/maps/ztn.ogz Binary files differnew file mode 100644 index 0000000..84a27d2 --- /dev/null +++ b/packages/maps/ztn.ogz diff --git a/packages/models/debris/masks.jpg b/packages/models/debris/masks.jpg Binary files differdeleted file mode 100644 index ca1e426..0000000 --- a/packages/models/debris/masks.jpg +++ /dev/null diff --git a/packages/models/debris/masks.png b/packages/models/debris/masks.png Binary files differnew file mode 100644 index 0000000..3b055d4 --- /dev/null +++ b/packages/models/debris/masks.png diff --git a/packages/models/debris/skin.jpg b/packages/models/debris/skin.jpg Binary files differdeleted file mode 100644 index db75ecd..0000000 --- a/packages/models/debris/skin.jpg +++ /dev/null diff --git a/packages/models/debris/skin.png b/packages/models/debris/skin.png Binary files differnew file mode 100644 index 0000000..dde4532 --- /dev/null +++ b/packages/models/debris/skin.png diff --git a/packages/models/gibs/gib01/skin.jpg b/packages/models/gibs/gib01/skin.jpg Binary files differdeleted file mode 100644 index 189411d..0000000 --- a/packages/models/gibs/gib01/skin.jpg +++ /dev/null diff --git a/packages/models/gibs/gib01/skin.png b/packages/models/gibs/gib01/skin.png Binary files differnew file mode 100644 index 0000000..69330e9 --- /dev/null +++ b/packages/models/gibs/gib01/skin.png diff --git a/packages/models/gibs/gib02/skin.jpg b/packages/models/gibs/gib02/skin.jpg Binary files differdeleted file mode 100644 index bd1c1d6..0000000 --- a/packages/models/gibs/gib02/skin.jpg +++ /dev/null diff --git a/packages/models/gibs/gib02/skin.png b/packages/models/gibs/gib02/skin.png Binary files differnew file mode 100644 index 0000000..a65e971 --- /dev/null +++ b/packages/models/gibs/gib02/skin.png diff --git a/packages/models/gibs/gib03/skin.jpg b/packages/models/gibs/gib03/skin.jpg Binary files differdeleted file mode 100644 index f1d56f3..0000000 --- a/packages/models/gibs/gib03/skin.jpg +++ /dev/null diff --git a/packages/models/gibs/gib03/skin.png b/packages/models/gibs/gib03/skin.png Binary files differnew file mode 100644 index 0000000..48cb2f9 --- /dev/null +++ b/packages/models/gibs/gib03/skin.png diff --git a/packages/models/projectiles/grenade/masks.jpg b/packages/models/projectiles/grenade/masks.jpg Binary files differdeleted file mode 100644 index 74eff9f..0000000 --- a/packages/models/projectiles/grenade/masks.jpg +++ /dev/null diff --git a/packages/models/projectiles/grenade/masks.png b/packages/models/projectiles/grenade/masks.png Binary files differnew file mode 100644 index 0000000..e08de82 --- /dev/null +++ b/packages/models/projectiles/grenade/masks.png diff --git a/packages/models/projectiles/grenade/skin.jpg b/packages/models/projectiles/grenade/skin.jpg Binary files differdeleted file mode 100644 index f1efd80..0000000 --- a/packages/models/projectiles/grenade/skin.jpg +++ /dev/null diff --git a/packages/models/projectiles/grenade/skin.png b/packages/models/projectiles/grenade/skin.png Binary files differnew file mode 100644 index 0000000..b4fbe5b --- /dev/null +++ b/packages/models/projectiles/grenade/skin.png diff --git a/packages/models/projectiles/rocket/masks.jpg b/packages/models/projectiles/rocket/masks.jpg Binary files differdeleted file mode 100644 index e7fbe20..0000000 --- a/packages/models/projectiles/rocket/masks.jpg +++ /dev/null diff --git a/packages/models/projectiles/rocket/masks.png b/packages/models/projectiles/rocket/masks.png Binary files differnew file mode 100644 index 0000000..275577a --- /dev/null +++ b/packages/models/projectiles/rocket/masks.png diff --git a/packages/models/projectiles/rocket/skin.jpg b/packages/models/projectiles/rocket/skin.jpg Binary files differdeleted file mode 100644 index d35e3b3..0000000 --- a/packages/models/projectiles/rocket/skin.jpg +++ /dev/null diff --git a/packages/models/projectiles/rocket/skin.png b/packages/models/projectiles/rocket/skin.png Binary files differnew file mode 100644 index 0000000..a0a22af --- /dev/null +++ b/packages/models/projectiles/rocket/skin.png diff --git a/packages/models/tinyarmour/diffuse.png b/packages/models/tinyarmour/diffuse.png Binary files differnew file mode 100644 index 0000000..c3bc55c --- /dev/null +++ b/packages/models/tinyarmour/diffuse.png diff --git a/packages/models/tinyarmour/mask.png b/packages/models/tinyarmour/mask.png Binary files differnew file mode 100644 index 0000000..61326d3 --- /dev/null +++ b/packages/models/tinyarmour/mask.png diff --git a/packages/models/tinyarmour/md3.cfg b/packages/models/tinyarmour/md3.cfg new file mode 100644 index 0000000..2b5210e --- /dev/null +++ b/packages/models/tinyarmour/md3.cfg @@ -0,0 +1,6 @@ +md3load model.md3
+md3skin * "diffuse.png" "mask.png"
+md3bumpmap * "normal.png"
+mdlambient 40
+mdlspec 120
+mdlscale 75
diff --git a/packages/models/tinyarmour/model.md3 b/packages/models/tinyarmour/model.md3 Binary files differnew file mode 100644 index 0000000..f92744a --- /dev/null +++ b/packages/models/tinyarmour/model.md3 diff --git a/packages/models/tinyarmour/normal.png b/packages/models/tinyarmour/normal.png Binary files differnew file mode 100644 index 0000000..b7a7050 --- /dev/null +++ b/packages/models/tinyarmour/normal.png diff --git a/packages/models/tinyhealth/diffuse.png b/packages/models/tinyhealth/diffuse.png Binary files differnew file mode 100644 index 0000000..0268632 --- /dev/null +++ b/packages/models/tinyhealth/diffuse.png diff --git a/packages/models/tinyhealth/mask.png b/packages/models/tinyhealth/mask.png Binary files differnew file mode 100644 index 0000000..a8a20b0 --- /dev/null +++ b/packages/models/tinyhealth/mask.png diff --git a/packages/models/tinyhealth/md3.cfg b/packages/models/tinyhealth/md3.cfg new file mode 100644 index 0000000..2b5210e --- /dev/null +++ b/packages/models/tinyhealth/md3.cfg @@ -0,0 +1,6 @@ +md3load model.md3
+md3skin * "diffuse.png" "mask.png"
+md3bumpmap * "normal.png"
+mdlambient 40
+mdlspec 120
+mdlscale 75
diff --git a/packages/models/tinyhealth/model.md3 b/packages/models/tinyhealth/model.md3 Binary files differnew file mode 100644 index 0000000..9e6da75 --- /dev/null +++ b/packages/models/tinyhealth/model.md3 diff --git a/packages/models/tinyhealth/normal.png b/packages/models/tinyhealth/normal.png Binary files differnew file mode 100644 index 0000000..fb3ce4c --- /dev/null +++ b/packages/models/tinyhealth/normal.png diff --git a/packages/particles/flare.jpg b/packages/particles/flare.jpg Binary files differdeleted file mode 100644 index b67625e..0000000 --- a/packages/particles/flare.jpg +++ /dev/null diff --git a/packages/particles/flare.png b/packages/particles/flare.png Binary files differnew file mode 100644 index 0000000..d904582 --- /dev/null +++ b/packages/particles/flare.png diff --git a/packages/particles/lightning.jpg b/packages/particles/lightning.jpg Binary files differdeleted file mode 100644 index 222e89d..0000000 --- a/packages/particles/lightning.jpg +++ /dev/null diff --git a/packages/particles/lightning.png b/packages/particles/lightning.png Binary files differnew file mode 100644 index 0000000..68e8071 --- /dev/null +++ b/packages/particles/lightning.png diff --git a/packages/particles/muzzleflash1.jpg b/packages/particles/muzzleflash1.jpg Binary files differdeleted file mode 100644 index 502648a..0000000 --- a/packages/particles/muzzleflash1.jpg +++ /dev/null diff --git a/packages/particles/muzzleflash1.png b/packages/particles/muzzleflash1.png Binary files differnew file mode 100644 index 0000000..35e7a73 --- /dev/null +++ b/packages/particles/muzzleflash1.png diff --git a/packages/particles/muzzleflash2.jpg b/packages/particles/muzzleflash2.jpg Binary files differdeleted file mode 100644 index 6dadafa..0000000 --- a/packages/particles/muzzleflash2.jpg +++ /dev/null diff --git a/packages/particles/muzzleflash2.png b/packages/particles/muzzleflash2.png Binary files differnew file mode 100644 index 0000000..b6c726c --- /dev/null +++ b/packages/particles/muzzleflash2.png diff --git a/packages/particles/muzzleflash3.jpg b/packages/particles/muzzleflash3.jpg Binary files differdeleted file mode 100644 index 7cf799c..0000000 --- a/packages/particles/muzzleflash3.jpg +++ /dev/null diff --git a/packages/particles/muzzleflash3.png b/packages/particles/muzzleflash3.png Binary files differnew file mode 100644 index 0000000..162ca42 --- /dev/null +++ b/packages/particles/muzzleflash3.png diff --git a/packages/skyboxes/black_bk.jpg b/packages/skyboxes/black_bk.jpg Binary files differdeleted file mode 100644 index ecf9079..0000000 --- a/packages/skyboxes/black_bk.jpg +++ /dev/null diff --git a/packages/skyboxes/black_bk.png b/packages/skyboxes/black_bk.png Binary files differnew file mode 100644 index 0000000..41f77e7 --- /dev/null +++ b/packages/skyboxes/black_bk.png diff --git a/packages/skyboxes/black_dn.jpg b/packages/skyboxes/black_dn.jpg Binary files differdeleted file mode 100644 index ecf9079..0000000 --- a/packages/skyboxes/black_dn.jpg +++ /dev/null diff --git a/packages/skyboxes/black_dn.png b/packages/skyboxes/black_dn.png Binary files differnew file mode 100644 index 0000000..41f77e7 --- /dev/null +++ b/packages/skyboxes/black_dn.png diff --git a/packages/skyboxes/black_ft.jpg b/packages/skyboxes/black_ft.jpg Binary files differdeleted file mode 100644 index ecf9079..0000000 --- a/packages/skyboxes/black_ft.jpg +++ /dev/null diff --git a/packages/skyboxes/black_ft.png b/packages/skyboxes/black_ft.png Binary files differnew file mode 100644 index 0000000..41f77e7 --- /dev/null +++ b/packages/skyboxes/black_ft.png diff --git a/packages/skyboxes/black_lf.jpg b/packages/skyboxes/black_lf.jpg Binary files differdeleted file mode 100644 index ecf9079..0000000 --- a/packages/skyboxes/black_lf.jpg +++ /dev/null diff --git a/packages/skyboxes/black_lf.png b/packages/skyboxes/black_lf.png Binary files differnew file mode 100644 index 0000000..41f77e7 --- /dev/null +++ b/packages/skyboxes/black_lf.png diff --git a/packages/skyboxes/black_rt.jpg b/packages/skyboxes/black_rt.jpg Binary files differdeleted file mode 100644 index ecf9079..0000000 --- a/packages/skyboxes/black_rt.jpg +++ /dev/null diff --git a/packages/skyboxes/black_rt.png b/packages/skyboxes/black_rt.png Binary files differnew file mode 100644 index 0000000..41f77e7 --- /dev/null +++ b/packages/skyboxes/black_rt.png diff --git a/packages/skyboxes/black_up.jpg b/packages/skyboxes/black_up.jpg Binary files differdeleted file mode 100644 index ecf9079..0000000 --- a/packages/skyboxes/black_up.jpg +++ /dev/null diff --git a/packages/skyboxes/black_up.png b/packages/skyboxes/black_up.png Binary files differnew file mode 100644 index 0000000..41f77e7 --- /dev/null +++ b/packages/skyboxes/black_up.png diff --git a/packages/textures/ex/clangfloor_01_d.jpg b/packages/textures/ex/clangfloor_01_d.jpg Binary files differdeleted file mode 100644 index 205c373..0000000 --- a/packages/textures/ex/clangfloor_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/clangfloor_01_d.png b/packages/textures/ex/clangfloor_01_d.png Binary files differnew file mode 100644 index 0000000..44f40b2 --- /dev/null +++ b/packages/textures/ex/clangfloor_01_d.png diff --git a/packages/textures/ex/clangfloor_01_h.jpg b/packages/textures/ex/clangfloor_01_h.jpg Binary files differdeleted file mode 100644 index 7c49d53..0000000 --- a/packages/textures/ex/clangfloor_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/clangfloor_01_h.png b/packages/textures/ex/clangfloor_01_h.png Binary files differnew file mode 100644 index 0000000..e1e8509 --- /dev/null +++ b/packages/textures/ex/clangfloor_01_h.png diff --git a/packages/textures/ex/clangfloor_01_s.jpg b/packages/textures/ex/clangfloor_01_s.jpg Binary files differdeleted file mode 100644 index 4d4d67a..0000000 --- a/packages/textures/ex/clangfloor_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/clangfloor_01_s.png b/packages/textures/ex/clangfloor_01_s.png Binary files differnew file mode 100644 index 0000000..21bba40 --- /dev/null +++ b/packages/textures/ex/clangfloor_01_s.png diff --git a/packages/textures/ex/clangfloor_01b_d.jpg b/packages/textures/ex/clangfloor_01b_d.jpg Binary files differdeleted file mode 100644 index 2d101a2..0000000 --- a/packages/textures/ex/clangfloor_01b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/clangfloor_01b_d.png b/packages/textures/ex/clangfloor_01b_d.png Binary files differnew file mode 100644 index 0000000..84991f7 --- /dev/null +++ b/packages/textures/ex/clangfloor_01b_d.png diff --git a/packages/textures/ex/cretebase_01_d.jpg b/packages/textures/ex/cretebase_01_d.jpg Binary files differdeleted file mode 100644 index f6c1258..0000000 --- a/packages/textures/ex/cretebase_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretebase_01_d.png b/packages/textures/ex/cretebase_01_d.png Binary files differnew file mode 100644 index 0000000..3a0cf7e --- /dev/null +++ b/packages/textures/ex/cretebase_01_d.png diff --git a/packages/textures/ex/cretebase_01_h.jpg b/packages/textures/ex/cretebase_01_h.jpg Binary files differdeleted file mode 100644 index 435761b..0000000 --- a/packages/textures/ex/cretebase_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/cretebase_01_h.png b/packages/textures/ex/cretebase_01_h.png Binary files differnew file mode 100644 index 0000000..9dec1bb --- /dev/null +++ b/packages/textures/ex/cretebase_01_h.png diff --git a/packages/textures/ex/cretebase_01_s.jpg b/packages/textures/ex/cretebase_01_s.jpg Binary files differdeleted file mode 100644 index 97f24f6..0000000 --- a/packages/textures/ex/cretebase_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/cretebase_01_s.png b/packages/textures/ex/cretebase_01_s.png Binary files differnew file mode 100644 index 0000000..a8b832d --- /dev/null +++ b/packages/textures/ex/cretebase_01_s.png diff --git a/packages/textures/ex/cretebase_02_d.jpg b/packages/textures/ex/cretebase_02_d.jpg Binary files differdeleted file mode 100644 index f7fd900..0000000 --- a/packages/textures/ex/cretebase_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretebase_02_d.png b/packages/textures/ex/cretebase_02_d.png Binary files differnew file mode 100644 index 0000000..d8d91f4 --- /dev/null +++ b/packages/textures/ex/cretebase_02_d.png diff --git a/packages/textures/ex/cretebase_03_dark_d.jpg b/packages/textures/ex/cretebase_03_dark_d.jpg Binary files differdeleted file mode 100644 index cea790e..0000000 --- a/packages/textures/ex/cretebase_03_dark_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretebase_03_dark_d.png b/packages/textures/ex/cretebase_03_dark_d.png Binary files differnew file mode 100644 index 0000000..e11ddd0 --- /dev/null +++ b/packages/textures/ex/cretebase_03_dark_d.png diff --git a/packages/textures/ex/cretefloor_01_d.jpg b/packages/textures/ex/cretefloor_01_d.jpg Binary files differdeleted file mode 100644 index 2be6f70..0000000 --- a/packages/textures/ex/cretefloor_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretefloor_01_d.png b/packages/textures/ex/cretefloor_01_d.png Binary files differnew file mode 100644 index 0000000..870a11b --- /dev/null +++ b/packages/textures/ex/cretefloor_01_d.png diff --git a/packages/textures/ex/cretefloor_01_h.jpg b/packages/textures/ex/cretefloor_01_h.jpg Binary files differdeleted file mode 100644 index 57c70b5..0000000 --- a/packages/textures/ex/cretefloor_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/cretefloor_01_h.png b/packages/textures/ex/cretefloor_01_h.png Binary files differnew file mode 100644 index 0000000..04bcc59 --- /dev/null +++ b/packages/textures/ex/cretefloor_01_h.png diff --git a/packages/textures/ex/cretefloor_01_s.jpg b/packages/textures/ex/cretefloor_01_s.jpg Binary files differdeleted file mode 100644 index 552d013..0000000 --- a/packages/textures/ex/cretefloor_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/cretefloor_01_s.png b/packages/textures/ex/cretefloor_01_s.png Binary files differnew file mode 100644 index 0000000..4896673 --- /dev/null +++ b/packages/textures/ex/cretefloor_01_s.png diff --git a/packages/textures/ex/cretefloor_01b_d.jpg b/packages/textures/ex/cretefloor_01b_d.jpg Binary files differdeleted file mode 100644 index b4501d5..0000000 --- a/packages/textures/ex/cretefloor_01b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretefloor_01b_d.png b/packages/textures/ex/cretefloor_01b_d.png Binary files differnew file mode 100644 index 0000000..33f9d18 --- /dev/null +++ b/packages/textures/ex/cretefloor_01b_d.png diff --git a/packages/textures/ex/cretefloor_01b_h.jpg b/packages/textures/ex/cretefloor_01b_h.jpg Binary files differdeleted file mode 100644 index e53f310..0000000 --- a/packages/textures/ex/cretefloor_01b_h.jpg +++ /dev/null diff --git a/packages/textures/ex/cretefloor_01b_h.png b/packages/textures/ex/cretefloor_01b_h.png Binary files differnew file mode 100644 index 0000000..e40877b --- /dev/null +++ b/packages/textures/ex/cretefloor_01b_h.png diff --git a/packages/textures/ex/cretefloor_01b_s.jpg b/packages/textures/ex/cretefloor_01b_s.jpg Binary files differdeleted file mode 100644 index 449ed2d..0000000 --- a/packages/textures/ex/cretefloor_01b_s.jpg +++ /dev/null diff --git a/packages/textures/ex/cretefloor_01b_s.png b/packages/textures/ex/cretefloor_01b_s.png Binary files differnew file mode 100644 index 0000000..ecdf48c --- /dev/null +++ b/packages/textures/ex/cretefloor_01b_s.png diff --git a/packages/textures/ex/cretewall_01_d.jpg b/packages/textures/ex/cretewall_01_d.jpg Binary files differdeleted file mode 100644 index 505b069..0000000 --- a/packages/textures/ex/cretewall_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_01_d.png b/packages/textures/ex/cretewall_01_d.png Binary files differnew file mode 100644 index 0000000..b55cb10 --- /dev/null +++ b/packages/textures/ex/cretewall_01_d.png diff --git a/packages/textures/ex/cretewall_01_h.jpg b/packages/textures/ex/cretewall_01_h.jpg Binary files differdeleted file mode 100644 index 5852d75..0000000 --- a/packages/textures/ex/cretewall_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_01_h.png b/packages/textures/ex/cretewall_01_h.png Binary files differnew file mode 100644 index 0000000..02af224 --- /dev/null +++ b/packages/textures/ex/cretewall_01_h.png diff --git a/packages/textures/ex/cretewall_01_s.jpg b/packages/textures/ex/cretewall_01_s.jpg Binary files differdeleted file mode 100644 index 86355d1..0000000 --- a/packages/textures/ex/cretewall_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_01_s.png b/packages/textures/ex/cretewall_01_s.png Binary files differnew file mode 100644 index 0000000..1b4d6ae --- /dev/null +++ b/packages/textures/ex/cretewall_01_s.png diff --git a/packages/textures/ex/cretewall_02_d.jpg b/packages/textures/ex/cretewall_02_d.jpg Binary files differdeleted file mode 100644 index a3a4c1a..0000000 --- a/packages/textures/ex/cretewall_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_02_d.png b/packages/textures/ex/cretewall_02_d.png Binary files differnew file mode 100644 index 0000000..c538e44 --- /dev/null +++ b/packages/textures/ex/cretewall_02_d.png diff --git a/packages/textures/ex/cretewall_02_h.jpg b/packages/textures/ex/cretewall_02_h.jpg Binary files differdeleted file mode 100644 index dba7072..0000000 --- a/packages/textures/ex/cretewall_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_02_h.png b/packages/textures/ex/cretewall_02_h.png Binary files differnew file mode 100644 index 0000000..8f93713 --- /dev/null +++ b/packages/textures/ex/cretewall_02_h.png diff --git a/packages/textures/ex/cretewall_02_s.jpg b/packages/textures/ex/cretewall_02_s.jpg Binary files differdeleted file mode 100644 index 21e6f71..0000000 --- a/packages/textures/ex/cretewall_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_02_s.png b/packages/textures/ex/cretewall_02_s.png Binary files differnew file mode 100644 index 0000000..2c07b2b --- /dev/null +++ b/packages/textures/ex/cretewall_02_s.png diff --git a/packages/textures/ex/cretewall_03_d.jpg b/packages/textures/ex/cretewall_03_d.jpg Binary files differdeleted file mode 100644 index 5b22397..0000000 --- a/packages/textures/ex/cretewall_03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_03_d.png b/packages/textures/ex/cretewall_03_d.png Binary files differnew file mode 100644 index 0000000..850baff --- /dev/null +++ b/packages/textures/ex/cretewall_03_d.png diff --git a/packages/textures/ex/cretewall_03_h.jpg b/packages/textures/ex/cretewall_03_h.jpg Binary files differdeleted file mode 100644 index 760cb73..0000000 --- a/packages/textures/ex/cretewall_03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_03_h.png b/packages/textures/ex/cretewall_03_h.png Binary files differnew file mode 100644 index 0000000..16d02ea --- /dev/null +++ b/packages/textures/ex/cretewall_03_h.png diff --git a/packages/textures/ex/cretewall_03_s.jpg b/packages/textures/ex/cretewall_03_s.jpg Binary files differdeleted file mode 100644 index 5cce63a..0000000 --- a/packages/textures/ex/cretewall_03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_03_s.png b/packages/textures/ex/cretewall_03_s.png Binary files differnew file mode 100644 index 0000000..ce7c3dd --- /dev/null +++ b/packages/textures/ex/cretewall_03_s.png diff --git a/packages/textures/ex/cretewall_03b_d.jpg b/packages/textures/ex/cretewall_03b_d.jpg Binary files differdeleted file mode 100644 index af58ed6..0000000 --- a/packages/textures/ex/cretewall_03b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_03b_d.png b/packages/textures/ex/cretewall_03b_d.png Binary files differnew file mode 100644 index 0000000..7582082 --- /dev/null +++ b/packages/textures/ex/cretewall_03b_d.png diff --git a/packages/textures/ex/cretewall_03b_h.jpg b/packages/textures/ex/cretewall_03b_h.jpg Binary files differdeleted file mode 100644 index 7467d33..0000000 --- a/packages/textures/ex/cretewall_03b_h.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_03b_h.png b/packages/textures/ex/cretewall_03b_h.png Binary files differnew file mode 100644 index 0000000..34aa831 --- /dev/null +++ b/packages/textures/ex/cretewall_03b_h.png diff --git a/packages/textures/ex/cretewall_03b_s.jpg b/packages/textures/ex/cretewall_03b_s.jpg Binary files differdeleted file mode 100644 index 4f25c19..0000000 --- a/packages/textures/ex/cretewall_03b_s.jpg +++ /dev/null diff --git a/packages/textures/ex/cretewall_03b_s.png b/packages/textures/ex/cretewall_03b_s.png Binary files differnew file mode 100644 index 0000000..b389667 --- /dev/null +++ b/packages/textures/ex/cretewall_03b_s.png diff --git a/packages/textures/ex/deswall_01_d.jpg b/packages/textures/ex/deswall_01_d.jpg Binary files differdeleted file mode 100644 index 006a862..0000000 --- a/packages/textures/ex/deswall_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/deswall_01_d.png b/packages/textures/ex/deswall_01_d.png Binary files differnew file mode 100644 index 0000000..4e7e2ca --- /dev/null +++ b/packages/textures/ex/deswall_01_d.png diff --git a/packages/textures/ex/deswall_01_h.jpg b/packages/textures/ex/deswall_01_h.jpg Binary files differdeleted file mode 100644 index 6b94b04..0000000 --- a/packages/textures/ex/deswall_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/deswall_01_h.png b/packages/textures/ex/deswall_01_h.png Binary files differnew file mode 100644 index 0000000..d08d34f --- /dev/null +++ b/packages/textures/ex/deswall_01_h.png diff --git a/packages/textures/ex/deswall_01_s.jpg b/packages/textures/ex/deswall_01_s.jpg Binary files differdeleted file mode 100644 index 6513145..0000000 --- a/packages/textures/ex/deswall_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/deswall_01_s.png b/packages/textures/ex/deswall_01_s.png Binary files differnew file mode 100644 index 0000000..9416e9b --- /dev/null +++ b/packages/textures/ex/deswall_01_s.png diff --git a/packages/textures/ex/floor_grate03_d.jpg b/packages/textures/ex/floor_grate03_d.jpg Binary files differdeleted file mode 100644 index de9b110..0000000 --- a/packages/textures/ex/floor_grate03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate03_d.png b/packages/textures/ex/floor_grate03_d.png Binary files differnew file mode 100644 index 0000000..eb5dd88 --- /dev/null +++ b/packages/textures/ex/floor_grate03_d.png diff --git a/packages/textures/ex/floor_grate03_h.jpg b/packages/textures/ex/floor_grate03_h.jpg Binary files differdeleted file mode 100644 index bfaf66c..0000000 --- a/packages/textures/ex/floor_grate03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate03_h.png b/packages/textures/ex/floor_grate03_h.png Binary files differnew file mode 100644 index 0000000..7d7340c --- /dev/null +++ b/packages/textures/ex/floor_grate03_h.png diff --git a/packages/textures/ex/floor_grate03_s.jpg b/packages/textures/ex/floor_grate03_s.jpg Binary files differdeleted file mode 100644 index 284e527..0000000 --- a/packages/textures/ex/floor_grate03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate03_s.png b/packages/textures/ex/floor_grate03_s.png Binary files differnew file mode 100644 index 0000000..3520b80 --- /dev/null +++ b/packages/textures/ex/floor_grate03_s.png diff --git a/packages/textures/ex/floor_grate_03_128_d.jpg b/packages/textures/ex/floor_grate_03_128_d.jpg Binary files differdeleted file mode 100644 index 01cefa6..0000000 --- a/packages/textures/ex/floor_grate_03_128_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate_03_128_d.png b/packages/textures/ex/floor_grate_03_128_d.png Binary files differnew file mode 100644 index 0000000..0628a41 --- /dev/null +++ b/packages/textures/ex/floor_grate_03_128_d.png diff --git a/packages/textures/ex/floor_grate_03_128_h.jpg b/packages/textures/ex/floor_grate_03_128_h.jpg Binary files differdeleted file mode 100644 index 782ef7c..0000000 --- a/packages/textures/ex/floor_grate_03_128_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate_03_128_h.png b/packages/textures/ex/floor_grate_03_128_h.png Binary files differnew file mode 100644 index 0000000..a10ca8a --- /dev/null +++ b/packages/textures/ex/floor_grate_03_128_h.png diff --git a/packages/textures/ex/floor_grate_03_128_s.jpg b/packages/textures/ex/floor_grate_03_128_s.jpg Binary files differdeleted file mode 100644 index 7dc08a7..0000000 --- a/packages/textures/ex/floor_grate_03_128_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate_03_128_s.png b/packages/textures/ex/floor_grate_03_128_s.png Binary files differnew file mode 100644 index 0000000..3f20de1 --- /dev/null +++ b/packages/textures/ex/floor_grate_03_128_s.png diff --git a/packages/textures/ex/floor_grate_03_d.jpg b/packages/textures/ex/floor_grate_03_d.jpg Binary files differdeleted file mode 100644 index 0f4e3d2..0000000 --- a/packages/textures/ex/floor_grate_03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate_03_d.png b/packages/textures/ex/floor_grate_03_d.png Binary files differnew file mode 100644 index 0000000..b6fa9f8 --- /dev/null +++ b/packages/textures/ex/floor_grate_03_d.png diff --git a/packages/textures/ex/floor_grate_03_h.jpg b/packages/textures/ex/floor_grate_03_h.jpg Binary files differdeleted file mode 100644 index a9d6149..0000000 --- a/packages/textures/ex/floor_grate_03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate_03_h.png b/packages/textures/ex/floor_grate_03_h.png Binary files differnew file mode 100644 index 0000000..1295945 --- /dev/null +++ b/packages/textures/ex/floor_grate_03_h.png diff --git a/packages/textures/ex/floor_grate_03_s.jpg b/packages/textures/ex/floor_grate_03_s.jpg Binary files differdeleted file mode 100644 index cc7b61b..0000000 --- a/packages/textures/ex/floor_grate_03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_grate_03_s.png b/packages/textures/ex/floor_grate_03_s.png Binary files differnew file mode 100644 index 0000000..319838f --- /dev/null +++ b/packages/textures/ex/floor_grate_03_s.png diff --git a/packages/textures/ex/floor_mtl_grate_01_d.jpg b/packages/textures/ex/floor_mtl_grate_01_d.jpg Binary files differdeleted file mode 100644 index cb9de1f..0000000 --- a/packages/textures/ex/floor_mtl_grate_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_mtl_grate_01_d.png b/packages/textures/ex/floor_mtl_grate_01_d.png Binary files differnew file mode 100644 index 0000000..9c12862 --- /dev/null +++ b/packages/textures/ex/floor_mtl_grate_01_d.png diff --git a/packages/textures/ex/floor_mtl_grate_01_h.jpg b/packages/textures/ex/floor_mtl_grate_01_h.jpg Binary files differdeleted file mode 100644 index bed91f3..0000000 --- a/packages/textures/ex/floor_mtl_grate_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_mtl_grate_01_h.png b/packages/textures/ex/floor_mtl_grate_01_h.png Binary files differnew file mode 100644 index 0000000..173105c --- /dev/null +++ b/packages/textures/ex/floor_mtl_grate_01_h.png diff --git a/packages/textures/ex/floor_mtl_grate_01_s.jpg b/packages/textures/ex/floor_mtl_grate_01_s.jpg Binary files differdeleted file mode 100644 index 18824bd..0000000 --- a/packages/textures/ex/floor_mtl_grate_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_mtl_grate_01_s.png b/packages/textures/ex/floor_mtl_grate_01_s.png Binary files differnew file mode 100644 index 0000000..eab6dcd --- /dev/null +++ b/packages/textures/ex/floor_mtl_grate_01_s.png diff --git a/packages/textures/ex/floor_mtl_wrn_01_d.jpg b/packages/textures/ex/floor_mtl_wrn_01_d.jpg Binary files differdeleted file mode 100644 index daad1dc..0000000 --- a/packages/textures/ex/floor_mtl_wrn_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_mtl_wrn_01_d.png b/packages/textures/ex/floor_mtl_wrn_01_d.png Binary files differnew file mode 100644 index 0000000..8694e5b --- /dev/null +++ b/packages/textures/ex/floor_mtl_wrn_01_d.png diff --git a/packages/textures/ex/floor_mtl_wrn_01_h.jpg b/packages/textures/ex/floor_mtl_wrn_01_h.jpg Binary files differdeleted file mode 100644 index 4c4ee72..0000000 --- a/packages/textures/ex/floor_mtl_wrn_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_mtl_wrn_01_h.png b/packages/textures/ex/floor_mtl_wrn_01_h.png Binary files differnew file mode 100644 index 0000000..63893cd --- /dev/null +++ b/packages/textures/ex/floor_mtl_wrn_01_h.png diff --git a/packages/textures/ex/floor_mtl_wrn_01_s.jpg b/packages/textures/ex/floor_mtl_wrn_01_s.jpg Binary files differdeleted file mode 100644 index eac6f92..0000000 --- a/packages/textures/ex/floor_mtl_wrn_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_mtl_wrn_01_s.png b/packages/textures/ex/floor_mtl_wrn_01_s.png Binary files differnew file mode 100644 index 0000000..6d545f5 --- /dev/null +++ b/packages/textures/ex/floor_mtl_wrn_01_s.png diff --git a/packages/textures/ex/floor_simple_05_d.jpg b/packages/textures/ex/floor_simple_05_d.jpg Binary files differdeleted file mode 100644 index cf864e3..0000000 --- a/packages/textures/ex/floor_simple_05_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_simple_05_d.png b/packages/textures/ex/floor_simple_05_d.png Binary files differnew file mode 100644 index 0000000..5dc5f5b --- /dev/null +++ b/packages/textures/ex/floor_simple_05_d.png diff --git a/packages/textures/ex/floor_simple_05_h.jpg b/packages/textures/ex/floor_simple_05_h.jpg Binary files differdeleted file mode 100644 index 3b7bcbb..0000000 --- a/packages/textures/ex/floor_simple_05_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_simple_05_h.png b/packages/textures/ex/floor_simple_05_h.png Binary files differnew file mode 100644 index 0000000..ba102dd --- /dev/null +++ b/packages/textures/ex/floor_simple_05_h.png diff --git a/packages/textures/ex/floor_simple_05_s.jpg b/packages/textures/ex/floor_simple_05_s.jpg Binary files differdeleted file mode 100644 index b47a046..0000000 --- a/packages/textures/ex/floor_simple_05_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_simple_05_s.png b/packages/textures/ex/floor_simple_05_s.png Binary files differnew file mode 100644 index 0000000..d4bfad5 --- /dev/null +++ b/packages/textures/ex/floor_simple_05_s.png diff --git a/packages/textures/ex/floor_simplines_d.jpg b/packages/textures/ex/floor_simplines_d.jpg Binary files differdeleted file mode 100644 index 7eb6a60..0000000 --- a/packages/textures/ex/floor_simplines_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_simplines_d.png b/packages/textures/ex/floor_simplines_d.png Binary files differnew file mode 100644 index 0000000..5d33989 --- /dev/null +++ b/packages/textures/ex/floor_simplines_d.png diff --git a/packages/textures/ex/floor_simplines_h.jpg b/packages/textures/ex/floor_simplines_h.jpg Binary files differdeleted file mode 100644 index 6d8d2df..0000000 --- a/packages/textures/ex/floor_simplines_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_simplines_h.png b/packages/textures/ex/floor_simplines_h.png Binary files differnew file mode 100644 index 0000000..fe96181 --- /dev/null +++ b/packages/textures/ex/floor_simplines_h.png diff --git a/packages/textures/ex/floor_simplines_s.jpg b/packages/textures/ex/floor_simplines_s.jpg Binary files differdeleted file mode 100644 index 6348bde..0000000 --- a/packages/textures/ex/floor_simplines_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_simplines_s.png b/packages/textures/ex/floor_simplines_s.png Binary files differnew file mode 100644 index 0000000..7580b77 --- /dev/null +++ b/packages/textures/ex/floor_simplines_s.png diff --git a/packages/textures/ex/floor_tile_03_d.jpg b/packages/textures/ex/floor_tile_03_d.jpg Binary files differdeleted file mode 100644 index 0d9c579..0000000 --- a/packages/textures/ex/floor_tile_03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_tile_03_d.png b/packages/textures/ex/floor_tile_03_d.png Binary files differnew file mode 100644 index 0000000..ae0ee6a --- /dev/null +++ b/packages/textures/ex/floor_tile_03_d.png diff --git a/packages/textures/ex/floor_tile_03_h.jpg b/packages/textures/ex/floor_tile_03_h.jpg Binary files differdeleted file mode 100644 index 2397f4e..0000000 --- a/packages/textures/ex/floor_tile_03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_tile_03_h.png b/packages/textures/ex/floor_tile_03_h.png Binary files differnew file mode 100644 index 0000000..6aba19e --- /dev/null +++ b/packages/textures/ex/floor_tile_03_h.png diff --git a/packages/textures/ex/floor_tile_03_s.jpg b/packages/textures/ex/floor_tile_03_s.jpg Binary files differdeleted file mode 100644 index 822dcea..0000000 --- a/packages/textures/ex/floor_tile_03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_tile_03_s.png b/packages/textures/ex/floor_tile_03_s.png Binary files differnew file mode 100644 index 0000000..a2e35ab --- /dev/null +++ b/packages/textures/ex/floor_tile_03_s.png diff --git a/packages/textures/ex/floor_tread_01_d.jpg b/packages/textures/ex/floor_tread_01_d.jpg Binary files differdeleted file mode 100644 index 6059a1a..0000000 --- a/packages/textures/ex/floor_tread_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_tread_01_d.png b/packages/textures/ex/floor_tread_01_d.png Binary files differnew file mode 100644 index 0000000..77cf3bd --- /dev/null +++ b/packages/textures/ex/floor_tread_01_d.png diff --git a/packages/textures/ex/floor_tread_01_h.jpg b/packages/textures/ex/floor_tread_01_h.jpg Binary files differdeleted file mode 100644 index fccb8ee..0000000 --- a/packages/textures/ex/floor_tread_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_tread_01_h.png b/packages/textures/ex/floor_tread_01_h.png Binary files differnew file mode 100644 index 0000000..7b4c066 --- /dev/null +++ b/packages/textures/ex/floor_tread_01_h.png diff --git a/packages/textures/ex/floor_tread_01_s.jpg b/packages/textures/ex/floor_tread_01_s.jpg Binary files differdeleted file mode 100644 index cb49ea1..0000000 --- a/packages/textures/ex/floor_tread_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floor_tread_01_s.png b/packages/textures/ex/floor_tread_01_s.png Binary files differnew file mode 100644 index 0000000..d4faccf --- /dev/null +++ b/packages/textures/ex/floor_tread_01_s.png diff --git a/packages/textures/ex/floorpanel_01_d.jpg b/packages/textures/ex/floorpanel_01_d.jpg Binary files differdeleted file mode 100644 index 41c0096..0000000 --- a/packages/textures/ex/floorpanel_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/floorpanel_01_d.png b/packages/textures/ex/floorpanel_01_d.png Binary files differnew file mode 100644 index 0000000..1349bed --- /dev/null +++ b/packages/textures/ex/floorpanel_01_d.png diff --git a/packages/textures/ex/floorpanel_01_h.jpg b/packages/textures/ex/floorpanel_01_h.jpg Binary files differdeleted file mode 100644 index f4a3907..0000000 --- a/packages/textures/ex/floorpanel_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/floorpanel_01_h.png b/packages/textures/ex/floorpanel_01_h.png Binary files differnew file mode 100644 index 0000000..b12458f --- /dev/null +++ b/packages/textures/ex/floorpanel_01_h.png diff --git a/packages/textures/ex/floorpanel_01_s.jpg b/packages/textures/ex/floorpanel_01_s.jpg Binary files differdeleted file mode 100644 index 58e329e..0000000 --- a/packages/textures/ex/floorpanel_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/floorpanel_01_s.png b/packages/textures/ex/floorpanel_01_s.png Binary files differnew file mode 100644 index 0000000..446b252 --- /dev/null +++ b/packages/textures/ex/floorpanel_01_s.png diff --git a/packages/textures/ex/light_u201_add.jpg b/packages/textures/ex/light_u201_add.jpg Binary files differdeleted file mode 100644 index 815984e..0000000 --- a/packages/textures/ex/light_u201_add.jpg +++ /dev/null diff --git a/packages/textures/ex/light_u201_add.png b/packages/textures/ex/light_u201_add.png Binary files differnew file mode 100644 index 0000000..a38c064 --- /dev/null +++ b/packages/textures/ex/light_u201_add.png diff --git a/packages/textures/ex/light_u201_d.jpg b/packages/textures/ex/light_u201_d.jpg Binary files differdeleted file mode 100644 index abc2ede..0000000 --- a/packages/textures/ex/light_u201_d.jpg +++ /dev/null diff --git a/packages/textures/ex/light_u201_d.png b/packages/textures/ex/light_u201_d.png Binary files differnew file mode 100644 index 0000000..aa2a3e9 --- /dev/null +++ b/packages/textures/ex/light_u201_d.png diff --git a/packages/textures/ex/light_u201_h.jpg b/packages/textures/ex/light_u201_h.jpg Binary files differdeleted file mode 100644 index 6569397..0000000 --- a/packages/textures/ex/light_u201_h.jpg +++ /dev/null diff --git a/packages/textures/ex/light_u201_h.png b/packages/textures/ex/light_u201_h.png Binary files differnew file mode 100644 index 0000000..7c6ee5d --- /dev/null +++ b/packages/textures/ex/light_u201_h.png diff --git a/packages/textures/ex/light_u201_s.jpg b/packages/textures/ex/light_u201_s.jpg Binary files differdeleted file mode 100644 index 290bf3c..0000000 --- a/packages/textures/ex/light_u201_s.jpg +++ /dev/null diff --git a/packages/textures/ex/light_u201_s.png b/packages/textures/ex/light_u201_s.png Binary files differnew file mode 100644 index 0000000..b5ffe87 --- /dev/null +++ b/packages/textures/ex/light_u201_s.png diff --git a/packages/textures/ex/lightpanel_01_add.jpg b/packages/textures/ex/lightpanel_01_add.jpg Binary files differdeleted file mode 100644 index 3ff97f5..0000000 --- a/packages/textures/ex/lightpanel_01_add.jpg +++ /dev/null diff --git a/packages/textures/ex/lightpanel_01_add.png b/packages/textures/ex/lightpanel_01_add.png Binary files differnew file mode 100644 index 0000000..251273a --- /dev/null +++ b/packages/textures/ex/lightpanel_01_add.png diff --git a/packages/textures/ex/lightpanel_01_d.jpg b/packages/textures/ex/lightpanel_01_d.jpg Binary files differdeleted file mode 100644 index 76e320d..0000000 --- a/packages/textures/ex/lightpanel_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/lightpanel_01_d.png b/packages/textures/ex/lightpanel_01_d.png Binary files differnew file mode 100644 index 0000000..3629b93 --- /dev/null +++ b/packages/textures/ex/lightpanel_01_d.png diff --git a/packages/textures/ex/lightpanel_01_h.jpg b/packages/textures/ex/lightpanel_01_h.jpg Binary files differdeleted file mode 100644 index 9aae865..0000000 --- a/packages/textures/ex/lightpanel_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/lightpanel_01_h.png b/packages/textures/ex/lightpanel_01_h.png Binary files differnew file mode 100644 index 0000000..6b053da --- /dev/null +++ b/packages/textures/ex/lightpanel_01_h.png diff --git a/packages/textures/ex/lightpanel_01_s.jpg b/packages/textures/ex/lightpanel_01_s.jpg Binary files differdeleted file mode 100644 index 46c75f9..0000000 --- a/packages/textures/ex/lightpanel_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/lightpanel_01_s.png b/packages/textures/ex/lightpanel_01_s.png Binary files differnew file mode 100644 index 0000000..bf841e9 --- /dev/null +++ b/packages/textures/ex/lightpanel_01_s.png diff --git a/packages/textures/ex/metal_base_01_d.jpg b/packages/textures/ex/metal_base_01_d.jpg Binary files differdeleted file mode 100644 index ed87729..0000000 --- a/packages/textures/ex/metal_base_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_01_d.png b/packages/textures/ex/metal_base_01_d.png Binary files differnew file mode 100644 index 0000000..e4fb273 --- /dev/null +++ b/packages/textures/ex/metal_base_01_d.png diff --git a/packages/textures/ex/metal_base_01_h.jpg b/packages/textures/ex/metal_base_01_h.jpg Binary files differdeleted file mode 100644 index f725254..0000000 --- a/packages/textures/ex/metal_base_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_01_h.png b/packages/textures/ex/metal_base_01_h.png Binary files differnew file mode 100644 index 0000000..f29d5c8 --- /dev/null +++ b/packages/textures/ex/metal_base_01_h.png diff --git a/packages/textures/ex/metal_base_01_s.jpg b/packages/textures/ex/metal_base_01_s.jpg Binary files differdeleted file mode 100644 index 4b9001d..0000000 --- a/packages/textures/ex/metal_base_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_01_s.png b/packages/textures/ex/metal_base_01_s.png Binary files differnew file mode 100644 index 0000000..665632e --- /dev/null +++ b/packages/textures/ex/metal_base_01_s.png diff --git a/packages/textures/ex/metal_base_02_d.jpg b/packages/textures/ex/metal_base_02_d.jpg Binary files differdeleted file mode 100644 index 47353c1..0000000 --- a/packages/textures/ex/metal_base_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_02_d.png b/packages/textures/ex/metal_base_02_d.png Binary files differnew file mode 100644 index 0000000..84c9ad2 --- /dev/null +++ b/packages/textures/ex/metal_base_02_d.png diff --git a/packages/textures/ex/metal_base_02_h.jpg b/packages/textures/ex/metal_base_02_h.jpg Binary files differdeleted file mode 100644 index e3589a8..0000000 --- a/packages/textures/ex/metal_base_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_02_h.png b/packages/textures/ex/metal_base_02_h.png Binary files differnew file mode 100644 index 0000000..a786397 --- /dev/null +++ b/packages/textures/ex/metal_base_02_h.png diff --git a/packages/textures/ex/metal_base_02_s.jpg b/packages/textures/ex/metal_base_02_s.jpg Binary files differdeleted file mode 100644 index e42cf71..0000000 --- a/packages/textures/ex/metal_base_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_02_s.png b/packages/textures/ex/metal_base_02_s.png Binary files differnew file mode 100644 index 0000000..3ede3d7 --- /dev/null +++ b/packages/textures/ex/metal_base_02_s.png diff --git a/packages/textures/ex/metal_base_03_d.jpg b/packages/textures/ex/metal_base_03_d.jpg Binary files differdeleted file mode 100644 index bf019f1..0000000 --- a/packages/textures/ex/metal_base_03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_03_d.png b/packages/textures/ex/metal_base_03_d.png Binary files differnew file mode 100644 index 0000000..691c5cd --- /dev/null +++ b/packages/textures/ex/metal_base_03_d.png diff --git a/packages/textures/ex/metal_base_03_h.jpg b/packages/textures/ex/metal_base_03_h.jpg Binary files differdeleted file mode 100644 index 0bfa16b..0000000 --- a/packages/textures/ex/metal_base_03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_03_h.png b/packages/textures/ex/metal_base_03_h.png Binary files differnew file mode 100644 index 0000000..9fd2252 --- /dev/null +++ b/packages/textures/ex/metal_base_03_h.png diff --git a/packages/textures/ex/metal_base_03_s.jpg b/packages/textures/ex/metal_base_03_s.jpg Binary files differdeleted file mode 100644 index 78db36c..0000000 --- a/packages/textures/ex/metal_base_03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_03_s.png b/packages/textures/ex/metal_base_03_s.png Binary files differnew file mode 100644 index 0000000..9f185aa --- /dev/null +++ b/packages/textures/ex/metal_base_03_s.png diff --git a/packages/textures/ex/metal_base_04_d.jpg b/packages/textures/ex/metal_base_04_d.jpg Binary files differdeleted file mode 100644 index 9a1c34c..0000000 --- a/packages/textures/ex/metal_base_04_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_04_d.png b/packages/textures/ex/metal_base_04_d.png Binary files differnew file mode 100644 index 0000000..488877a --- /dev/null +++ b/packages/textures/ex/metal_base_04_d.png diff --git a/packages/textures/ex/metal_base_05_rust_d.jpg b/packages/textures/ex/metal_base_05_rust_d.jpg Binary files differdeleted file mode 100644 index 4d9f699..0000000 --- a/packages/textures/ex/metal_base_05_rust_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_05_rust_d.png b/packages/textures/ex/metal_base_05_rust_d.png Binary files differnew file mode 100644 index 0000000..300b80a --- /dev/null +++ b/packages/textures/ex/metal_base_05_rust_d.png diff --git a/packages/textures/ex/metal_base_05_rust_h.jpg b/packages/textures/ex/metal_base_05_rust_h.jpg Binary files differdeleted file mode 100644 index 43893b8..0000000 --- a/packages/textures/ex/metal_base_05_rust_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_05_rust_h.png b/packages/textures/ex/metal_base_05_rust_h.png Binary files differnew file mode 100644 index 0000000..5fe2e15 --- /dev/null +++ b/packages/textures/ex/metal_base_05_rust_h.png diff --git a/packages/textures/ex/metal_base_05_rust_s.jpg b/packages/textures/ex/metal_base_05_rust_s.jpg Binary files differdeleted file mode 100644 index 7b37062..0000000 --- a/packages/textures/ex/metal_base_05_rust_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_05_rust_s.png b/packages/textures/ex/metal_base_05_rust_s.png Binary files differnew file mode 100644 index 0000000..3854626 --- /dev/null +++ b/packages/textures/ex/metal_base_05_rust_s.png diff --git a/packages/textures/ex/metal_base_06_rust_d.jpg b/packages/textures/ex/metal_base_06_rust_d.jpg Binary files differdeleted file mode 100644 index efee3be..0000000 --- a/packages/textures/ex/metal_base_06_rust_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_06_rust_d.png b/packages/textures/ex/metal_base_06_rust_d.png Binary files differnew file mode 100644 index 0000000..6f61b50 --- /dev/null +++ b/packages/textures/ex/metal_base_06_rust_d.png diff --git a/packages/textures/ex/metal_base_07_rust_d.jpg b/packages/textures/ex/metal_base_07_rust_d.jpg Binary files differdeleted file mode 100644 index 53185b8..0000000 --- a/packages/textures/ex/metal_base_07_rust_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_base_07_rust_d.png b/packages/textures/ex/metal_base_07_rust_d.png Binary files differnew file mode 100644 index 0000000..871c0a9 --- /dev/null +++ b/packages/textures/ex/metal_base_07_rust_d.png diff --git a/packages/textures/ex/metal_floor_02_d.jpg b/packages/textures/ex/metal_floor_02_d.jpg Binary files differdeleted file mode 100644 index 0cc04c4..0000000 --- a/packages/textures/ex/metal_floor_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_floor_02_d.png b/packages/textures/ex/metal_floor_02_d.png Binary files differnew file mode 100644 index 0000000..06cab57 --- /dev/null +++ b/packages/textures/ex/metal_floor_02_d.png diff --git a/packages/textures/ex/metal_floor_02_h.jpg b/packages/textures/ex/metal_floor_02_h.jpg Binary files differdeleted file mode 100644 index 9355e8a..0000000 --- a/packages/textures/ex/metal_floor_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_floor_02_h.png b/packages/textures/ex/metal_floor_02_h.png Binary files differnew file mode 100644 index 0000000..4f22188 --- /dev/null +++ b/packages/textures/ex/metal_floor_02_h.png diff --git a/packages/textures/ex/metal_floor_02_s.jpg b/packages/textures/ex/metal_floor_02_s.jpg Binary files differdeleted file mode 100644 index 70030fc..0000000 --- a/packages/textures/ex/metal_floor_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_floor_02_s.png b/packages/textures/ex/metal_floor_02_s.png Binary files differnew file mode 100644 index 0000000..16f5ef1 --- /dev/null +++ b/packages/textures/ex/metal_floor_02_s.png diff --git a/packages/textures/ex/metal_plate_01_d.jpg b/packages/textures/ex/metal_plate_01_d.jpg Binary files differdeleted file mode 100644 index 8a7640f..0000000 --- a/packages/textures/ex/metal_plate_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01_d.png b/packages/textures/ex/metal_plate_01_d.png Binary files differnew file mode 100644 index 0000000..f93336e --- /dev/null +++ b/packages/textures/ex/metal_plate_01_d.png diff --git a/packages/textures/ex/metal_plate_01_h.jpg b/packages/textures/ex/metal_plate_01_h.jpg Binary files differdeleted file mode 100644 index 796a7d0..0000000 --- a/packages/textures/ex/metal_plate_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01_h.png b/packages/textures/ex/metal_plate_01_h.png Binary files differnew file mode 100644 index 0000000..c4e97f1 --- /dev/null +++ b/packages/textures/ex/metal_plate_01_h.png diff --git a/packages/textures/ex/metal_plate_01_s.jpg b/packages/textures/ex/metal_plate_01_s.jpg Binary files differdeleted file mode 100644 index af9ca69..0000000 --- a/packages/textures/ex/metal_plate_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01_s.png b/packages/textures/ex/metal_plate_01_s.png Binary files differnew file mode 100644 index 0000000..53ceafc --- /dev/null +++ b/packages/textures/ex/metal_plate_01_s.png diff --git a/packages/textures/ex/metal_plate_01b_d.jpg b/packages/textures/ex/metal_plate_01b_d.jpg Binary files differdeleted file mode 100644 index 849a87d..0000000 --- a/packages/textures/ex/metal_plate_01b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01b_d.png b/packages/textures/ex/metal_plate_01b_d.png Binary files differnew file mode 100644 index 0000000..f534bdb --- /dev/null +++ b/packages/textures/ex/metal_plate_01b_d.png diff --git a/packages/textures/ex/metal_plate_01b_h.jpg b/packages/textures/ex/metal_plate_01b_h.jpg Binary files differdeleted file mode 100644 index 9a4dc32..0000000 --- a/packages/textures/ex/metal_plate_01b_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01b_h.png b/packages/textures/ex/metal_plate_01b_h.png Binary files differnew file mode 100644 index 0000000..438f207 --- /dev/null +++ b/packages/textures/ex/metal_plate_01b_h.png diff --git a/packages/textures/ex/metal_plate_01b_s.jpg b/packages/textures/ex/metal_plate_01b_s.jpg Binary files differdeleted file mode 100644 index b3aee55..0000000 --- a/packages/textures/ex/metal_plate_01b_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01b_s.png b/packages/textures/ex/metal_plate_01b_s.png Binary files differnew file mode 100644 index 0000000..da5d225 --- /dev/null +++ b/packages/textures/ex/metal_plate_01b_s.png diff --git a/packages/textures/ex/metal_plate_01c_d.jpg b/packages/textures/ex/metal_plate_01c_d.jpg Binary files differdeleted file mode 100644 index 1442e92..0000000 --- a/packages/textures/ex/metal_plate_01c_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01c_d.png b/packages/textures/ex/metal_plate_01c_d.png Binary files differnew file mode 100644 index 0000000..f3af579 --- /dev/null +++ b/packages/textures/ex/metal_plate_01c_d.png diff --git a/packages/textures/ex/metal_plate_01c_h.jpg b/packages/textures/ex/metal_plate_01c_h.jpg Binary files differdeleted file mode 100644 index f8ec6b9..0000000 --- a/packages/textures/ex/metal_plate_01c_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01c_h.png b/packages/textures/ex/metal_plate_01c_h.png Binary files differnew file mode 100644 index 0000000..76f8256 --- /dev/null +++ b/packages/textures/ex/metal_plate_01c_h.png diff --git a/packages/textures/ex/metal_plate_01c_s.jpg b/packages/textures/ex/metal_plate_01c_s.jpg Binary files differdeleted file mode 100644 index 84962b6..0000000 --- a/packages/textures/ex/metal_plate_01c_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_plate_01c_s.png b/packages/textures/ex/metal_plate_01c_s.png Binary files differnew file mode 100644 index 0000000..e3ebc0e --- /dev/null +++ b/packages/textures/ex/metal_plate_01c_s.png diff --git a/packages/textures/ex/metal_rib_01_d.jpg b/packages/textures/ex/metal_rib_01_d.jpg Binary files differdeleted file mode 100644 index 18551c9..0000000 --- a/packages/textures/ex/metal_rib_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_rib_01_d.png b/packages/textures/ex/metal_rib_01_d.png Binary files differnew file mode 100644 index 0000000..6b226a6 --- /dev/null +++ b/packages/textures/ex/metal_rib_01_d.png diff --git a/packages/textures/ex/metal_rib_01_h.jpg b/packages/textures/ex/metal_rib_01_h.jpg Binary files differdeleted file mode 100644 index b06e762..0000000 --- a/packages/textures/ex/metal_rib_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_rib_01_h.png b/packages/textures/ex/metal_rib_01_h.png Binary files differnew file mode 100644 index 0000000..0550c5e --- /dev/null +++ b/packages/textures/ex/metal_rib_01_h.png diff --git a/packages/textures/ex/metal_rib_01_s.jpg b/packages/textures/ex/metal_rib_01_s.jpg Binary files differdeleted file mode 100644 index 763c4ba..0000000 --- a/packages/textures/ex/metal_rib_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_rib_01_s.png b/packages/textures/ex/metal_rib_01_s.png Binary files differnew file mode 100644 index 0000000..cb9093c --- /dev/null +++ b/packages/textures/ex/metal_rib_01_s.png diff --git a/packages/textures/ex/metal_supp_01_d.jpg b/packages/textures/ex/metal_supp_01_d.jpg Binary files differdeleted file mode 100644 index 75b6992..0000000 --- a/packages/textures/ex/metal_supp_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_supp_01_d.png b/packages/textures/ex/metal_supp_01_d.png Binary files differnew file mode 100644 index 0000000..f50d91c --- /dev/null +++ b/packages/textures/ex/metal_supp_01_d.png diff --git a/packages/textures/ex/metal_supp_01_h.jpg b/packages/textures/ex/metal_supp_01_h.jpg Binary files differdeleted file mode 100644 index 7b3bdeb..0000000 --- a/packages/textures/ex/metal_supp_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_supp_01_h.png b/packages/textures/ex/metal_supp_01_h.png Binary files differnew file mode 100644 index 0000000..705bae9 --- /dev/null +++ b/packages/textures/ex/metal_supp_01_h.png diff --git a/packages/textures/ex/metal_supp_01_s.jpg b/packages/textures/ex/metal_supp_01_s.jpg Binary files differdeleted file mode 100644 index 0a3af29..0000000 --- a/packages/textures/ex/metal_supp_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_supp_01_s.png b/packages/textures/ex/metal_supp_01_s.png Binary files differnew file mode 100644 index 0000000..6510a89 --- /dev/null +++ b/packages/textures/ex/metal_supp_01_s.png diff --git a/packages/textures/ex/metal_wall_02_d.jpg b/packages/textures/ex/metal_wall_02_d.jpg Binary files differdeleted file mode 100644 index 8ba36ef..0000000 --- a/packages/textures/ex/metal_wall_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_wall_02_d.png b/packages/textures/ex/metal_wall_02_d.png Binary files differnew file mode 100644 index 0000000..f6d2b01 --- /dev/null +++ b/packages/textures/ex/metal_wall_02_d.png diff --git a/packages/textures/ex/metal_wall_02_h.jpg b/packages/textures/ex/metal_wall_02_h.jpg Binary files differdeleted file mode 100644 index c1c7d08..0000000 --- a/packages/textures/ex/metal_wall_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_wall_02_h.png b/packages/textures/ex/metal_wall_02_h.png Binary files differnew file mode 100644 index 0000000..418772b --- /dev/null +++ b/packages/textures/ex/metal_wall_02_h.png diff --git a/packages/textures/ex/metal_wall_02_s.jpg b/packages/textures/ex/metal_wall_02_s.jpg Binary files differdeleted file mode 100644 index fb9fdea..0000000 --- a/packages/textures/ex/metal_wall_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metal_wall_02_s.png b/packages/textures/ex/metal_wall_02_s.png Binary files differnew file mode 100644 index 0000000..54e9d98 --- /dev/null +++ b/packages/textures/ex/metal_wall_02_s.png diff --git a/packages/textures/ex/metalbase01_d.jpg b/packages/textures/ex/metalbase01_d.jpg Binary files differdeleted file mode 100644 index d655acc..0000000 --- a/packages/textures/ex/metalbase01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase01_d.png b/packages/textures/ex/metalbase01_d.png Binary files differnew file mode 100644 index 0000000..752494f --- /dev/null +++ b/packages/textures/ex/metalbase01_d.png diff --git a/packages/textures/ex/metalbase01_h.jpg b/packages/textures/ex/metalbase01_h.jpg Binary files differdeleted file mode 100644 index c6932af..0000000 --- a/packages/textures/ex/metalbase01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase01_h.png b/packages/textures/ex/metalbase01_h.png Binary files differnew file mode 100644 index 0000000..52dc2c3 --- /dev/null +++ b/packages/textures/ex/metalbase01_h.png diff --git a/packages/textures/ex/metalbase01_local.jpg b/packages/textures/ex/metalbase01_local.jpg Binary files differdeleted file mode 100644 index 8edae58..0000000 --- a/packages/textures/ex/metalbase01_local.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase01_local.png b/packages/textures/ex/metalbase01_local.png Binary files differnew file mode 100644 index 0000000..534c6a8 --- /dev/null +++ b/packages/textures/ex/metalbase01_local.png diff --git a/packages/textures/ex/metalbase01_s.jpg b/packages/textures/ex/metalbase01_s.jpg Binary files differdeleted file mode 100644 index b6fa874..0000000 --- a/packages/textures/ex/metalbase01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase01_s.png b/packages/textures/ex/metalbase01_s.png Binary files differnew file mode 100644 index 0000000..c0e3bbf --- /dev/null +++ b/packages/textures/ex/metalbase01_s.png diff --git a/packages/textures/ex/metalbase03_d.jpg b/packages/textures/ex/metalbase03_d.jpg Binary files differdeleted file mode 100644 index 53afd22..0000000 --- a/packages/textures/ex/metalbase03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase03_d.png b/packages/textures/ex/metalbase03_d.png Binary files differnew file mode 100644 index 0000000..2633d96 --- /dev/null +++ b/packages/textures/ex/metalbase03_d.png diff --git a/packages/textures/ex/metalbase03_h.jpg b/packages/textures/ex/metalbase03_h.jpg Binary files differdeleted file mode 100644 index c6932af..0000000 --- a/packages/textures/ex/metalbase03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase03_h.png b/packages/textures/ex/metalbase03_h.png Binary files differnew file mode 100644 index 0000000..52dc2c3 --- /dev/null +++ b/packages/textures/ex/metalbase03_h.png diff --git a/packages/textures/ex/metalbase03_local.jpg b/packages/textures/ex/metalbase03_local.jpg Binary files differdeleted file mode 100644 index 8edae58..0000000 --- a/packages/textures/ex/metalbase03_local.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase03_local.png b/packages/textures/ex/metalbase03_local.png Binary files differnew file mode 100644 index 0000000..534c6a8 --- /dev/null +++ b/packages/textures/ex/metalbase03_local.png diff --git a/packages/textures/ex/metalbase03_s.jpg b/packages/textures/ex/metalbase03_s.jpg Binary files differdeleted file mode 100644 index b6fa874..0000000 --- a/packages/textures/ex/metalbase03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase03_s.png b/packages/textures/ex/metalbase03_s.png Binary files differnew file mode 100644 index 0000000..c0e3bbf --- /dev/null +++ b/packages/textures/ex/metalbase03_s.png diff --git a/packages/textures/ex/metalbase04_d.jpg b/packages/textures/ex/metalbase04_d.jpg Binary files differdeleted file mode 100644 index 276259a..0000000 --- a/packages/textures/ex/metalbase04_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase04_d.png b/packages/textures/ex/metalbase04_d.png Binary files differnew file mode 100644 index 0000000..bb9f383 --- /dev/null +++ b/packages/textures/ex/metalbase04_d.png diff --git a/packages/textures/ex/metalbase05rust_d.jpg b/packages/textures/ex/metalbase05rust_d.jpg Binary files differdeleted file mode 100644 index f31972e..0000000 --- a/packages/textures/ex/metalbase05rust_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase05rust_d.png b/packages/textures/ex/metalbase05rust_d.png Binary files differnew file mode 100644 index 0000000..841a9e4 --- /dev/null +++ b/packages/textures/ex/metalbase05rust_d.png diff --git a/packages/textures/ex/metalbase05rust_h.jpg b/packages/textures/ex/metalbase05rust_h.jpg Binary files differdeleted file mode 100644 index d613e8d..0000000 --- a/packages/textures/ex/metalbase05rust_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase05rust_h.png b/packages/textures/ex/metalbase05rust_h.png Binary files differnew file mode 100644 index 0000000..9b4cf70 --- /dev/null +++ b/packages/textures/ex/metalbase05rust_h.png diff --git a/packages/textures/ex/metalbase05rust_local.jpg b/packages/textures/ex/metalbase05rust_local.jpg Binary files differdeleted file mode 100644 index 8edae58..0000000 --- a/packages/textures/ex/metalbase05rust_local.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase05rust_local.png b/packages/textures/ex/metalbase05rust_local.png Binary files differnew file mode 100644 index 0000000..e150e8e --- /dev/null +++ b/packages/textures/ex/metalbase05rust_local.png diff --git a/packages/textures/ex/metalbase05rust_s.jpg b/packages/textures/ex/metalbase05rust_s.jpg Binary files differdeleted file mode 100644 index b6fa874..0000000 --- a/packages/textures/ex/metalbase05rust_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metalbase05rust_s.png b/packages/textures/ex/metalbase05rust_s.png Binary files differnew file mode 100644 index 0000000..ab3fb04 --- /dev/null +++ b/packages/textures/ex/metalbase05rust_s.png diff --git a/packages/textures/ex/metalfloor02_d.jpg b/packages/textures/ex/metalfloor02_d.jpg Binary files differdeleted file mode 100644 index cda6089..0000000 --- a/packages/textures/ex/metalfloor02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalfloor02_d.png b/packages/textures/ex/metalfloor02_d.png Binary files differnew file mode 100644 index 0000000..6118378 --- /dev/null +++ b/packages/textures/ex/metalfloor02_d.png diff --git a/packages/textures/ex/metalfloor02_h.jpg b/packages/textures/ex/metalfloor02_h.jpg Binary files differdeleted file mode 100644 index 3be1e03..0000000 --- a/packages/textures/ex/metalfloor02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metalfloor02_h.png b/packages/textures/ex/metalfloor02_h.png Binary files differnew file mode 100644 index 0000000..3ebb8c9 --- /dev/null +++ b/packages/textures/ex/metalfloor02_h.png diff --git a/packages/textures/ex/metalfloor02_local.jpg b/packages/textures/ex/metalfloor02_local.jpg Binary files differdeleted file mode 100644 index 100c9f8..0000000 --- a/packages/textures/ex/metalfloor02_local.jpg +++ /dev/null diff --git a/packages/textures/ex/metalfloor02_local.png b/packages/textures/ex/metalfloor02_local.png Binary files differnew file mode 100644 index 0000000..9a2af85 --- /dev/null +++ b/packages/textures/ex/metalfloor02_local.png diff --git a/packages/textures/ex/metalfloor02_s.jpg b/packages/textures/ex/metalfloor02_s.jpg Binary files differdeleted file mode 100644 index 813f6b8..0000000 --- a/packages/textures/ex/metalfloor02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metalfloor02_s.png b/packages/textures/ex/metalfloor02_s.png Binary files differnew file mode 100644 index 0000000..707dd63 --- /dev/null +++ b/packages/textures/ex/metalfloor02_s.png diff --git a/packages/textures/ex/metalplate_01_d.jpg b/packages/textures/ex/metalplate_01_d.jpg Binary files differdeleted file mode 100644 index f7aee07..0000000 --- a/packages/textures/ex/metalplate_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalplate_01_d.png b/packages/textures/ex/metalplate_01_d.png Binary files differnew file mode 100644 index 0000000..746910a --- /dev/null +++ b/packages/textures/ex/metalplate_01_d.png diff --git a/packages/textures/ex/metalplate_01_h.jpg b/packages/textures/ex/metalplate_01_h.jpg Binary files differdeleted file mode 100644 index 21d2465..0000000 --- a/packages/textures/ex/metalplate_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metalplate_01_h.png b/packages/textures/ex/metalplate_01_h.png Binary files differnew file mode 100644 index 0000000..20cac91 --- /dev/null +++ b/packages/textures/ex/metalplate_01_h.png diff --git a/packages/textures/ex/metalplate_01_s.jpg b/packages/textures/ex/metalplate_01_s.jpg Binary files differdeleted file mode 100644 index 764f845..0000000 --- a/packages/textures/ex/metalplate_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metalplate_01_s.png b/packages/textures/ex/metalplate_01_s.png Binary files differnew file mode 100644 index 0000000..f97df6e --- /dev/null +++ b/packages/textures/ex/metalplate_01_s.png diff --git a/packages/textures/ex/metalsupp01_d.jpg b/packages/textures/ex/metalsupp01_d.jpg Binary files differdeleted file mode 100644 index acf0ba0..0000000 --- a/packages/textures/ex/metalsupp01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalsupp01_d.png b/packages/textures/ex/metalsupp01_d.png Binary files differnew file mode 100644 index 0000000..af39d80 --- /dev/null +++ b/packages/textures/ex/metalsupp01_d.png diff --git a/packages/textures/ex/metalsupp01_h.jpg b/packages/textures/ex/metalsupp01_h.jpg Binary files differdeleted file mode 100644 index 274126b..0000000 --- a/packages/textures/ex/metalsupp01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metalsupp01_h.png b/packages/textures/ex/metalsupp01_h.png Binary files differnew file mode 100644 index 0000000..8814746 --- /dev/null +++ b/packages/textures/ex/metalsupp01_h.png diff --git a/packages/textures/ex/metalsupp01_local.jpg b/packages/textures/ex/metalsupp01_local.jpg Binary files differdeleted file mode 100644 index 556bc27..0000000 --- a/packages/textures/ex/metalsupp01_local.jpg +++ /dev/null diff --git a/packages/textures/ex/metalsupp01_local.png b/packages/textures/ex/metalsupp01_local.png Binary files differnew file mode 100644 index 0000000..52df4b2 --- /dev/null +++ b/packages/textures/ex/metalsupp01_local.png diff --git a/packages/textures/ex/metalsupp01_s.jpg b/packages/textures/ex/metalsupp01_s.jpg Binary files differdeleted file mode 100644 index 58ed9cb..0000000 --- a/packages/textures/ex/metalsupp01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metalsupp01_s.png b/packages/textures/ex/metalsupp01_s.png Binary files differnew file mode 100644 index 0000000..6b4c934 --- /dev/null +++ b/packages/textures/ex/metalsupp01_s.png diff --git a/packages/textures/ex/metalwall02_d.jpg b/packages/textures/ex/metalwall02_d.jpg Binary files differdeleted file mode 100644 index d18df8c..0000000 --- a/packages/textures/ex/metalwall02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/metalwall02_d.png b/packages/textures/ex/metalwall02_d.png Binary files differnew file mode 100644 index 0000000..d41c46c --- /dev/null +++ b/packages/textures/ex/metalwall02_d.png diff --git a/packages/textures/ex/metalwall02_h.jpg b/packages/textures/ex/metalwall02_h.jpg Binary files differdeleted file mode 100644 index ac5658a..0000000 --- a/packages/textures/ex/metalwall02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/metalwall02_h.png b/packages/textures/ex/metalwall02_h.png Binary files differnew file mode 100644 index 0000000..e7f8ffe --- /dev/null +++ b/packages/textures/ex/metalwall02_h.png diff --git a/packages/textures/ex/metalwall02_local.jpg b/packages/textures/ex/metalwall02_local.jpg Binary files differdeleted file mode 100644 index f8101b9..0000000 --- a/packages/textures/ex/metalwall02_local.jpg +++ /dev/null diff --git a/packages/textures/ex/metalwall02_local.png b/packages/textures/ex/metalwall02_local.png Binary files differnew file mode 100644 index 0000000..870785f --- /dev/null +++ b/packages/textures/ex/metalwall02_local.png diff --git a/packages/textures/ex/metalwall02_s.jpg b/packages/textures/ex/metalwall02_s.jpg Binary files differdeleted file mode 100644 index c74f1f1..0000000 --- a/packages/textures/ex/metalwall02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/metalwall02_s.png b/packages/textures/ex/metalwall02_s.png Binary files differnew file mode 100644 index 0000000..6a11ee0 --- /dev/null +++ b/packages/textures/ex/metalwall02_s.png diff --git a/packages/textures/ex/mtl_bigplate_04_d.jpg b/packages/textures/ex/mtl_bigplate_04_d.jpg Binary files differdeleted file mode 100644 index f95a38f..0000000 --- a/packages/textures/ex/mtl_bigplate_04_d.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_bigplate_04_d.png b/packages/textures/ex/mtl_bigplate_04_d.png Binary files differnew file mode 100644 index 0000000..8119ee5 --- /dev/null +++ b/packages/textures/ex/mtl_bigplate_04_d.png diff --git a/packages/textures/ex/mtl_bigplate_04_h.jpg b/packages/textures/ex/mtl_bigplate_04_h.jpg Binary files differdeleted file mode 100644 index 6bb997e..0000000 --- a/packages/textures/ex/mtl_bigplate_04_h.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_bigplate_04_h.png b/packages/textures/ex/mtl_bigplate_04_h.png Binary files differnew file mode 100644 index 0000000..6be525c --- /dev/null +++ b/packages/textures/ex/mtl_bigplate_04_h.png diff --git a/packages/textures/ex/mtl_bigplate_04_s.jpg b/packages/textures/ex/mtl_bigplate_04_s.jpg Binary files differdeleted file mode 100644 index afc0415..0000000 --- a/packages/textures/ex/mtl_bigplate_04_s.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_bigplate_04_s.png b/packages/textures/ex/mtl_bigplate_04_s.png Binary files differnew file mode 100644 index 0000000..7992d45 --- /dev/null +++ b/packages/textures/ex/mtl_bigplate_04_s.png diff --git a/packages/textures/ex/mtl_bigplate_04b_d.jpg b/packages/textures/ex/mtl_bigplate_04b_d.jpg Binary files differdeleted file mode 100644 index 12e90dc..0000000 --- a/packages/textures/ex/mtl_bigplate_04b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_bigplate_04b_d.png b/packages/textures/ex/mtl_bigplate_04b_d.png Binary files differnew file mode 100644 index 0000000..4b8a7d0 --- /dev/null +++ b/packages/textures/ex/mtl_bigplate_04b_d.png diff --git a/packages/textures/ex/mtl_bigplate_04b_h.jpg b/packages/textures/ex/mtl_bigplate_04b_h.jpg Binary files differdeleted file mode 100644 index d1509f7..0000000 --- a/packages/textures/ex/mtl_bigplate_04b_h.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_bigplate_04b_h.png b/packages/textures/ex/mtl_bigplate_04b_h.png Binary files differnew file mode 100644 index 0000000..ef26566 --- /dev/null +++ b/packages/textures/ex/mtl_bigplate_04b_h.png diff --git a/packages/textures/ex/mtl_bigplate_04b_s.jpg b/packages/textures/ex/mtl_bigplate_04b_s.jpg Binary files differdeleted file mode 100644 index b83eeb6..0000000 --- a/packages/textures/ex/mtl_bigplate_04b_s.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_bigplate_04b_s.png b/packages/textures/ex/mtl_bigplate_04b_s.png Binary files differnew file mode 100644 index 0000000..8079b92 --- /dev/null +++ b/packages/textures/ex/mtl_bigplate_04b_s.png diff --git a/packages/textures/ex/mtl_panel_02_d.jpg b/packages/textures/ex/mtl_panel_02_d.jpg Binary files differdeleted file mode 100644 index da87a99..0000000 --- a/packages/textures/ex/mtl_panel_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_02_d.png b/packages/textures/ex/mtl_panel_02_d.png Binary files differnew file mode 100644 index 0000000..842529d --- /dev/null +++ b/packages/textures/ex/mtl_panel_02_d.png diff --git a/packages/textures/ex/mtl_panel_02_h.jpg b/packages/textures/ex/mtl_panel_02_h.jpg Binary files differdeleted file mode 100644 index f9d5e8a..0000000 --- a/packages/textures/ex/mtl_panel_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_02_h.png b/packages/textures/ex/mtl_panel_02_h.png Binary files differnew file mode 100644 index 0000000..0235301 --- /dev/null +++ b/packages/textures/ex/mtl_panel_02_h.png diff --git a/packages/textures/ex/mtl_panel_02_s.jpg b/packages/textures/ex/mtl_panel_02_s.jpg Binary files differdeleted file mode 100644 index 2a0209b..0000000 --- a/packages/textures/ex/mtl_panel_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_02_s.png b/packages/textures/ex/mtl_panel_02_s.png Binary files differnew file mode 100644 index 0000000..386a463 --- /dev/null +++ b/packages/textures/ex/mtl_panel_02_s.png diff --git a/packages/textures/ex/mtl_panel_03_d.jpg b/packages/textures/ex/mtl_panel_03_d.jpg Binary files differdeleted file mode 100644 index beb1e40..0000000 --- a/packages/textures/ex/mtl_panel_03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_03_d.png b/packages/textures/ex/mtl_panel_03_d.png Binary files differnew file mode 100644 index 0000000..0331575 --- /dev/null +++ b/packages/textures/ex/mtl_panel_03_d.png diff --git a/packages/textures/ex/mtl_panel_03_h.jpg b/packages/textures/ex/mtl_panel_03_h.jpg Binary files differdeleted file mode 100644 index b124ba7..0000000 --- a/packages/textures/ex/mtl_panel_03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_03_h.png b/packages/textures/ex/mtl_panel_03_h.png Binary files differnew file mode 100644 index 0000000..58c983c --- /dev/null +++ b/packages/textures/ex/mtl_panel_03_h.png diff --git a/packages/textures/ex/mtl_panel_03_s.jpg b/packages/textures/ex/mtl_panel_03_s.jpg Binary files differdeleted file mode 100644 index b78e950..0000000 --- a/packages/textures/ex/mtl_panel_03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_03_s.png b/packages/textures/ex/mtl_panel_03_s.png Binary files differnew file mode 100644 index 0000000..8e3cec7 --- /dev/null +++ b/packages/textures/ex/mtl_panel_03_s.png diff --git a/packages/textures/ex/mtl_panel_04_d.jpg b/packages/textures/ex/mtl_panel_04_d.jpg Binary files differdeleted file mode 100644 index cf32319..0000000 --- a/packages/textures/ex/mtl_panel_04_d.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_04_d.png b/packages/textures/ex/mtl_panel_04_d.png Binary files differnew file mode 100644 index 0000000..817e46f --- /dev/null +++ b/packages/textures/ex/mtl_panel_04_d.png diff --git a/packages/textures/ex/mtl_panel_04_h.jpg b/packages/textures/ex/mtl_panel_04_h.jpg Binary files differdeleted file mode 100644 index d4cc906..0000000 --- a/packages/textures/ex/mtl_panel_04_h.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_04_h.png b/packages/textures/ex/mtl_panel_04_h.png Binary files differnew file mode 100644 index 0000000..0ff54b0 --- /dev/null +++ b/packages/textures/ex/mtl_panel_04_h.png diff --git a/packages/textures/ex/mtl_panel_04_s.jpg b/packages/textures/ex/mtl_panel_04_s.jpg Binary files differdeleted file mode 100644 index 5a4341c..0000000 --- a/packages/textures/ex/mtl_panel_04_s.jpg +++ /dev/null diff --git a/packages/textures/ex/mtl_panel_04_s.png b/packages/textures/ex/mtl_panel_04_s.png Binary files differnew file mode 100644 index 0000000..24d69f6 --- /dev/null +++ b/packages/textures/ex/mtl_panel_04_s.png diff --git a/packages/textures/ex/package.cfg b/packages/textures/ex/package.cfg index e594e16..8f979fa 100644 --- a/packages/textures/ex/package.cfg +++ b/packages/textures/ex/package.cfg @@ -1,462 +1,462 @@ setshader bumpspecmapparallaxglowworld
-setshaderparam specscale 2 2 2
+setshaderparam specscale 0.6 0.6 0.6
setshaderparam parallaxscale 0.04 -0.02
setshaderparam glowcolor 1 0.59 0.01
-texture 0 "textures/yves_allaire/ex/light_u201_d.jpg"
-texture n "textures/yves_allaire/ex/light_u201_local.png"
-texture s "textures/yves_allaire/ex/light_u201_s.jpg"
-texture z "textures/yves_allaire/ex/light_u201_h.jpg"
-texture g "textures/yves_allaire/ex/light_u201_add.jpg"
+texture 0 "textures/ex/light_u201_d.png"
+texture n "textures/ex/light_u201_local.png"
+texture s "textures/ex/light_u201_s.png"
+texture z "textures/ex/light_u201_h.png"
+texture g "textures/ex/light_u201_add.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/lightpanel_01_d.jpg"
-texture n "textures/yves_allaire/ex/lightpanel_01_local.png"
-texture s "textures/yves_allaire/ex/lightpanel_01_s.jpg"
-texture z "textures/yves_allaire/ex/lightpanel_01_h.jpg"
-texture g "textures/yves_allaire/ex/lightpanel_01_add.jpg"
+texture 0 "textures/ex/lightpanel_01_d.png"
+texture n "textures/ex/lightpanel_01_local.png"
+texture s "textures/ex/lightpanel_01_s.png"
+texture z "textures/ex/lightpanel_01_h.png"
+texture g "textures/ex/lightpanel_01_add.png"
texscale 0.5
setshader bumpspecmapparallaxworld
-setshaderparam specscale 2 2 2
+setshaderparam specscale 0.6 0.6 0.6
setshaderparam parallaxscale 0.04 -0.02
-texture 0 "textures/yves_allaire/ex/clangfloor_01_d.jpg"
-texture n "textures/yves_allaire/ex/clangfloor_01_local.png"
-texture s "textures/yves_allaire/ex/clangfloor_01_s.jpg"
-texture z "textures/yves_allaire/ex/clangfloor_01_h.jpg"
+texture 0 "textures/ex/clangfloor_01_d.png"
+texture n "textures/ex/clangfloor_01_local.png"
+texture s "textures/ex/clangfloor_01_s.png"
+texture z "textures/ex/clangfloor_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/clangfloor_01b_d.jpg"
-texture n "textures/yves_allaire/ex/clangfloor_01_local.png"
-texture s "textures/yves_allaire/ex/clangfloor_01_s.jpg"
-texture z "textures/yves_allaire/ex/clangfloor_01_h.jpg"
+texture 0 "textures/ex/clangfloor_01b_d.png"
+texture n "textures/ex/clangfloor_01_local.png"
+texture s "textures/ex/clangfloor_01_s.png"
+texture z "textures/ex/clangfloor_01_h.png"
texscale 0.5
-setshaderparam specscale 1 1 1
+setshaderparam specscale 0.3 0.3 0.3
-texture 0 "textures/yves_allaire/ex/cretebase_01_d.jpg"
-texture n "textures/yves_allaire/ex/cretebase_01_local.png"
-texture s "textures/yves_allaire/ex/cretebase_01_s.jpg"
-texture z "textures/yves_allaire/ex/cretebase_01_h.jpg"
+texture 0 "textures/ex/cretebase_01_d.png"
+texture n "textures/ex/cretebase_01_local.png"
+texture s "textures/ex/cretebase_01_s.png"
+texture z "textures/ex/cretebase_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretebase_02_d.jpg"
-texture n "textures/yves_allaire/ex/cretebase_01_local.png"
-texture s "textures/yves_allaire/ex/cretebase_01_s.jpg"
-texture z "textures/yves_allaire/ex/cretebase_01_h.jpg"
+texture 0 "textures/ex/cretebase_02_d.png"
+texture n "textures/ex/cretebase_01_local.png"
+texture s "textures/ex/cretebase_01_s.png"
+texture z "textures/ex/cretebase_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretebase_03_dark_d.jpg"
-texture n "textures/yves_allaire/ex/cretebase_01_local.png"
-texture s "textures/yves_allaire/ex/cretebase_01_s.jpg"
-texture z "textures/yves_allaire/ex/cretebase_01_h.jpg"
+texture 0 "textures/ex/cretebase_03_dark_d.png"
+texture n "textures/ex/cretebase_01_local.png"
+texture s "textures/ex/cretebase_01_s.png"
+texture z "textures/ex/cretebase_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretefloor_01_d.jpg"
-texture n "textures/yves_allaire/ex/cretefloor_01_local.png"
-texture s "textures/yves_allaire/ex/cretefloor_01_s.jpg"
-texture z "textures/yves_allaire/ex/cretefloor_01_h.jpg"
+texture 0 "textures/ex/cretefloor_01_d.png"
+texture n "textures/ex/cretefloor_01_local.png"
+texture s "textures/ex/cretefloor_01_s.png"
+texture z "textures/ex/cretefloor_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretefloor_01b_d.jpg"
-texture n "textures/yves_allaire/ex/cretefloor_01b_local.png"
-texture s "textures/yves_allaire/ex/cretefloor_01b_s.jpg"
-texture z "textures/yves_allaire/ex/cretefloor_01b_h.jpg"
+texture 0 "textures/ex/cretefloor_01b_d.png"
+texture n "textures/ex/cretefloor_01b_local.png"
+texture s "textures/ex/cretefloor_01b_s.png"
+texture z "textures/ex/cretefloor_01b_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretewall_01_d.jpg"
-texture n "textures/yves_allaire/ex/cretewall_01_local.png"
-texture s "textures/yves_allaire/ex/cretewall_01_s.jpg"
-texture z "textures/yves_allaire/ex/cretewall_01_h.jpg"
+texture 0 "textures/ex/cretewall_01_d.png"
+texture n "textures/ex/cretewall_01_local.png"
+texture s "textures/ex/cretewall_01_s.png"
+texture z "textures/ex/cretewall_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretewall_02_d.jpg"
-texture n "textures/yves_allaire/ex/cretewall_02_local.png"
-texture s "textures/yves_allaire/ex/cretewall_02_s.jpg"
-texture z "textures/yves_allaire/ex/cretewall_02_h.jpg"
+texture 0 "textures/ex/cretewall_02_d.png"
+texture n "textures/ex/cretewall_02_local.png"
+texture s "textures/ex/cretewall_02_s.png"
+texture z "textures/ex/cretewall_02_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretewall_03_d.jpg"
-texture n "textures/yves_allaire/ex/cretewall_03_local.png"
-texture s "textures/yves_allaire/ex/cretewall_03_s.jpg"
-texture z "textures/yves_allaire/ex/cretewall_03_h.jpg"
+texture 0 "textures/ex/cretewall_03_d.png"
+texture n "textures/ex/cretewall_03_local.png"
+texture s "textures/ex/cretewall_03_s.png"
+texture z "textures/ex/cretewall_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/cretewall_03b_d.jpg"
-texture n "textures/yves_allaire/ex/cretewall_03b_local.png"
-texture s "textures/yves_allaire/ex/cretewall_03b_s.jpg"
-texture z "textures/yves_allaire/ex/cretewall_03b_h.jpg"
+texture 0 "textures/ex/cretewall_03b_d.png"
+texture n "textures/ex/cretewall_03b_local.png"
+texture s "textures/ex/cretewall_03b_s.png"
+texture z "textures/ex/cretewall_03b_h.png"
texscale 0.5
-setshaderparam specscale 2 2 2
+setshaderparam specscale 0.6 0.6 0.6
-texture 0 "textures/yves_allaire/ex/deswall_01_d.jpg"
-texture n "textures/yves_allaire/ex/deswall_01_local.png"
-texture s "textures/yves_allaire/ex/deswall_01_s.jpg"
-texture z "textures/yves_allaire/ex/deswall_01_h.jpg"
+texture 0 "textures/ex/deswall_01_d.png"
+texture n "textures/ex/deswall_01_local.png"
+texture s "textures/ex/deswall_01_s.png"
+texture z "textures/ex/deswall_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_grate_03_128_d.jpg"
-texture n "textures/yves_allaire/ex/floor_grate_03_128_local.png"
-texture s "textures/yves_allaire/ex/floor_grate_03_128_s.jpg"
-texture z "textures/yves_allaire/ex/floor_grate_03_128_h.jpg"
+texture 0 "textures/ex/floor_grate_03_128_d.png"
+texture n "textures/ex/floor_grate_03_128_local.png"
+texture s "textures/ex/floor_grate_03_128_s.png"
+texture z "textures/ex/floor_grate_03_128_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_grate_03_d.jpg"
-texture n "textures/yves_allaire/ex/floor_grate_03_local.png"
-texture s "textures/yves_allaire/ex/floor_grate_03_s.jpg"
-texture z "textures/yves_allaire/ex/floor_grate_03_h.jpg"
+texture 0 "textures/ex/floor_grate_03_d.png"
+texture n "textures/ex/floor_grate_03_local.png"
+texture s "textures/ex/floor_grate_03_s.png"
+texture z "textures/ex/floor_grate_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_grate03_d.jpg"
-texture n "textures/yves_allaire/ex/floor_grate03_local.png"
-texture s "textures/yves_allaire/ex/floor_grate03_s.jpg"
-texture z "textures/yves_allaire/ex/floor_grate03_h.jpg"
+texture 0 "textures/ex/floor_grate03_d.png"
+texture n "textures/ex/floor_grate03_local.png"
+texture s "textures/ex/floor_grate03_s.png"
+texture z "textures/ex/floor_grate03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_mtl_grate_01_d.jpg"
-texture n "textures/yves_allaire/ex/floor_mtl_grate_01_local.png"
-texture s "textures/yves_allaire/ex/floor_mtl_grate_01_s.jpg"
-texture z "textures/yves_allaire/ex/floor_mtl_grate_01_h.jpg"
+texture 0 "textures/ex/floor_mtl_grate_01_d.png"
+texture n "textures/ex/floor_mtl_grate_01_local.png"
+texture s "textures/ex/floor_mtl_grate_01_s.png"
+texture z "textures/ex/floor_mtl_grate_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_mtl_wrn_01_d.jpg"
-texture n "textures/yves_allaire/ex/floor_mtl_wrn_01_local.png"
-texture s "textures/yves_allaire/ex/floor_mtl_wrn_01_s.jpg"
-texture z "textures/yves_allaire/ex/floor_mtl_wrn_01_h.jpg"
+texture 0 "textures/ex/floor_mtl_wrn_01_d.png"
+texture n "textures/ex/floor_mtl_wrn_01_local.png"
+texture s "textures/ex/floor_mtl_wrn_01_s.png"
+texture z "textures/ex/floor_mtl_wrn_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_simple_05_d.jpg"
-texture n "textures/yves_allaire/ex/floor_simple_05_local.png"
-texture s "textures/yves_allaire/ex/floor_simple_05_s.jpg"
-texture z "textures/yves_allaire/ex/floor_simple_05_h.jpg"
+texture 0 "textures/ex/floor_simple_05_d.png"
+texture n "textures/ex/floor_simple_05_local.png"
+texture s "textures/ex/floor_simple_05_s.png"
+texture z "textures/ex/floor_simple_05_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_simplines_d.jpg"
-texture n "textures/yves_allaire/ex/floor_simplines_local.png"
-texture s "textures/yves_allaire/ex/floor_simplines_s.jpg"
-texture z "textures/yves_allaire/ex/floor_simplines_h.jpg"
+texture 0 "textures/ex/floor_simplines_d.png"
+texture n "textures/ex/floor_simplines_local.png"
+texture s "textures/ex/floor_simplines_s.png"
+texture z "textures/ex/floor_simplines_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_tile_03_d.jpg"
-texture n "textures/yves_allaire/ex/floor_tile_03_local.png"
-texture s "textures/yves_allaire/ex/floor_tile_03_s.jpg"
-texture z "textures/yves_allaire/ex/floor_tile_03_h.jpg"
+texture 0 "textures/ex/floor_tile_03_d.png"
+texture n "textures/ex/floor_tile_03_local.png"
+texture s "textures/ex/floor_tile_03_s.png"
+texture z "textures/ex/floor_tile_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floor_tread_01_d.jpg"
-texture n "textures/yves_allaire/ex/floor_tread_01_local.png"
-texture s "textures/yves_allaire/ex/floor_tread_01_s.jpg"
-texture z "textures/yves_allaire/ex/floor_tread_01_h.jpg"
+texture 0 "textures/ex/floor_tread_01_d.png"
+texture n "textures/ex/floor_tread_01_local.png"
+texture s "textures/ex/floor_tread_01_s.png"
+texture z "textures/ex/floor_tread_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/floorpanel_01_d.jpg"
-texture n "textures/yves_allaire/ex/floorpanel_01_local.png"
-texture s "textures/yves_allaire/ex/floorpanel_01_s.jpg"
-texture z "textures/yves_allaire/ex/floorpanel_01_h.jpg"
+texture 0 "textures/ex/floorpanel_01_d.png"
+texture n "textures/ex/floorpanel_01_local.png"
+texture s "textures/ex/floorpanel_01_s.png"
+texture z "textures/ex/floorpanel_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metalplate_01_d.jpg"
-texture n "textures/yves_allaire/ex/metalplate_01_local.png"
-texture s "textures/yves_allaire/ex/metalplate_01_s.jpg"
-texture z "textures/yves_allaire/ex/metalplate_01_h.jpg"
+texture 0 "textures/ex/metalplate_01_d.png"
+texture n "textures/ex/metalplate_01_local.png"
+texture s "textures/ex/metalplate_01_s.png"
+texture z "textures/ex/metalplate_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_supp_01_d.jpg"
-texture n "textures/yves_allaire/ex/metal_supp_01_local.png"
-texture s "textures/yves_allaire/ex/metal_supp_01_s.jpg"
-texture z "textures/yves_allaire/ex/metal_supp_01_h.jpg"
+texture 0 "textures/ex/metal_supp_01_d.png"
+texture n "textures/ex/metal_supp_01_local.png"
+texture s "textures/ex/metal_supp_01_s.png"
+texture z "textures/ex/metal_supp_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_wall_02_d.jpg"
-texture n "textures/yves_allaire/ex/metal_wall_02_local.png"
-texture s "textures/yves_allaire/ex/metal_wall_02_s.jpg"
-texture z "textures/yves_allaire/ex/metal_wall_02_h.jpg"
+texture 0 "textures/ex/metal_wall_02_d.png"
+texture n "textures/ex/metal_wall_02_local.png"
+texture s "textures/ex/metal_wall_02_s.png"
+texture z "textures/ex/metal_wall_02_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/mtl_bigplate_04_d.jpg"
-texture n "textures/yves_allaire/ex/mtl_bigplate_04_local.png"
-texture s "textures/yves_allaire/ex/mtl_bigplate_04_s.jpg"
-texture z "textures/yves_allaire/ex/mtl_bigplate_04_h.jpg"
+texture 0 "textures/ex/mtl_bigplate_04_d.png"
+texture n "textures/ex/mtl_bigplate_04_local.png"
+texture s "textures/ex/mtl_bigplate_04_s.png"
+texture z "textures/ex/mtl_bigplate_04_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/mtl_bigplate_04b_d.jpg"
-texture n "textures/yves_allaire/ex/mtl_bigplate_04b_local.png"
-texture s "textures/yves_allaire/ex/mtl_bigplate_04b_s.jpg"
-texture z "textures/yves_allaire/ex/mtl_bigplate_04b_h.jpg"
+texture 0 "textures/ex/mtl_bigplate_04b_d.png"
+texture n "textures/ex/mtl_bigplate_04b_local.png"
+texture s "textures/ex/mtl_bigplate_04b_s.png"
+texture z "textures/ex/mtl_bigplate_04b_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/mtl_panel_02_d.jpg"
-texture n "textures/yves_allaire/ex/mtl_panel_02_local.png"
-texture s "textures/yves_allaire/ex/mtl_panel_02_s.jpg"
-texture z "textures/yves_allaire/ex/mtl_panel_02_h.jpg"
+texture 0 "textures/ex/mtl_panel_02_d.png"
+texture n "textures/ex/mtl_panel_02_local.png"
+texture s "textures/ex/mtl_panel_02_s.png"
+texture z "textures/ex/mtl_panel_02_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/mtl_panel_03_d.jpg"
-texture n "textures/yves_allaire/ex/mtl_panel_03_local.png"
-texture s "textures/yves_allaire/ex/mtl_panel_03_s.jpg"
-texture z "textures/yves_allaire/ex/mtl_panel_03_h.jpg"
+texture 0 "textures/ex/mtl_panel_03_d.png"
+texture n "textures/ex/mtl_panel_03_local.png"
+texture s "textures/ex/mtl_panel_03_s.png"
+texture z "textures/ex/mtl_panel_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/mtl_panel_04_d.jpg"
-texture n "textures/yves_allaire/ex/mtl_panel_04_local.png"
-texture s "textures/yves_allaire/ex/mtl_panel_04_s.jpg"
-texture z "textures/yves_allaire/ex/mtl_panel_04_h.jpg"
+texture 0 "textures/ex/mtl_panel_04_d.png"
+texture n "textures/ex/mtl_panel_04_local.png"
+texture s "textures/ex/mtl_panel_04_s.png"
+texture z "textures/ex/mtl_panel_04_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/q2_01_d.jpg"
-texture n "textures/yves_allaire/ex/q2_01_local.png"
-texture s "textures/yves_allaire/ex/q2_01_s.jpg"
-texture z "textures/yves_allaire/ex/q2_01_h.jpg"
+texture 0 "textures/ex/q2_01_d.png"
+texture n "textures/ex/q2_01_local.png"
+texture s "textures/ex/q2_01_s.png"
+texture z "textures/ex/q2_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/q2_01b_d.jpg"
-texture n "textures/yves_allaire/ex/q2_01b_local.png"
-texture s "textures/yves_allaire/ex/q2_01b_s.jpg"
-texture z "textures/yves_allaire/ex/q2_01b_h.jpg"
+texture 0 "textures/ex/q2_01b_d.png"
+texture n "textures/ex/q2_01b_local.png"
+texture s "textures/ex/q2_01b_s.png"
+texture z "textures/ex/q2_01b_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/q2_01c_d.jpg"
-texture n "textures/yves_allaire/ex/q2_01c_local.png"
-texture s "textures/yves_allaire/ex/q2_01c_s.jpg"
-texture z "textures/yves_allaire/ex/q2_01c_h.jpg"
+texture 0 "textures/ex/q2_01c_d.png"
+texture n "textures/ex/q2_01c_local.png"
+texture s "textures/ex/q2_01c_s.png"
+texture z "textures/ex/q2_01c_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/q2_01d_d.jpg"
-texture n "textures/yves_allaire/ex/q2_01d_local.png"
-texture s "textures/yves_allaire/ex/q2_01d_s.jpg"
-texture z "textures/yves_allaire/ex/q2_01d_h.jpg"
+texture 0 "textures/ex/q2_01d_d.png"
+texture n "textures/ex/q2_01d_local.png"
+texture s "textures/ex/q2_01d_s.png"
+texture z "textures/ex/q2_01d_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/q2_01e_d.jpg"
-texture n "textures/yves_allaire/ex/q2_01e_local.png"
-texture s "textures/yves_allaire/ex/q2_01e_s.jpg"
-texture z "textures/yves_allaire/ex/q2_01e_h.jpg"
+texture 0 "textures/ex/q2_01e_d.png"
+texture n "textures/ex/q2_01e_local.png"
+texture s "textures/ex/q2_01e_s.png"
+texture z "textures/ex/q2_01e_h.png"
texscale 0.5
setshaderparam parallaxscale 0.02 -0.01
-texture 0 "textures/yves_allaire/ex/rndfloor_01_d.jpg"
-texture n "textures/yves_allaire/ex/rndfloor_01_local.png"
-texture s "textures/yves_allaire/ex/rndfloor_01_s.jpg"
-texture z "textures/yves_allaire/ex/rndfloor_01_h.jpg"
+texture 0 "textures/ex/rndfloor_01_d.png"
+texture n "textures/ex/rndfloor_01_local.png"
+texture s "textures/ex/rndfloor_01_s.png"
+texture z "textures/ex/rndfloor_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/rndfloor_02_d.jpg"
-texture n "textures/yves_allaire/ex/rndfloor_02_local.png"
-texture s "textures/yves_allaire/ex/rndfloor_02_s.jpg"
-texture z "textures/yves_allaire/ex/rndfloor_02_h.jpg"
+texture 0 "textures/ex/rndfloor_02_d.png"
+texture n "textures/ex/rndfloor_02_local.png"
+texture s "textures/ex/rndfloor_02_s.png"
+texture z "textures/ex/rndfloor_02_h.png"
texscale 0.5
setshaderparam parallaxscale 0.04 -0.02
-texture 0 "textures/yves_allaire/ex/rplates_01_d.jpg"
-texture n "textures/yves_allaire/ex/rplates_01_local.png"
-texture s "textures/yves_allaire/ex/rplates_01_s.jpg"
-texture z "textures/yves_allaire/ex/rplates_01_h.jpg"
+texture 0 "textures/ex/rplates_01_d.png"
+texture n "textures/ex/rplates_01_local.png"
+texture s "textures/ex/rplates_01_s.png"
+texture z "textures/ex/rplates_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/steptop_01_d.jpg"
-texture n "textures/yves_allaire/ex/steptop_01_local.png"
-texture s "textures/yves_allaire/ex/steptop_01_s.jpg"
-texture z "textures/yves_allaire/ex/steptop_01_h.jpg"
+texture 0 "textures/ex/steptop_01_d.png"
+texture n "textures/ex/steptop_01_local.png"
+texture s "textures/ex/steptop_01_s.png"
+texture z "textures/ex/steptop_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_01_d.jpg"
-texture n "textures/yves_allaire/ex/trim_01_local.png"
-texture s "textures/yves_allaire/ex/trim_01_s.jpg"
-texture z "textures/yves_allaire/ex/trim_01_h.jpg"
+texture 0 "textures/ex/trim_01_d.png"
+texture n "textures/ex/trim_01_local.png"
+texture s "textures/ex/trim_01_s.png"
+texture z "textures/ex/trim_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_baseboard_02_d.jpg"
-texture n "textures/yves_allaire/ex/trim_baseboard_02_local.png"
-texture s "textures/yves_allaire/ex/trim_baseboard_02_s.jpg"
-texture z "textures/yves_allaire/ex/trim_baseboard_02_h.jpg"
+texture 0 "textures/ex/trim_baseboard_02_d.png"
+texture n "textures/ex/trim_baseboard_02_local.png"
+texture s "textures/ex/trim_baseboard_02_s.png"
+texture z "textures/ex/trim_baseboard_02_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_baseboard_03_d.jpg"
-texture n "textures/yves_allaire/ex/trim_baseboard_03_local.png"
-texture s "textures/yves_allaire/ex/trim_baseboard_03_s.jpg"
-texture z "textures/yves_allaire/ex/trim_baseboard_03_h.jpg"
+texture 0 "textures/ex/trim_baseboard_03_d.png"
+texture n "textures/ex/trim_baseboard_03_local.png"
+texture s "textures/ex/trim_baseboard_03_s.png"
+texture z "textures/ex/trim_baseboard_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_baseboard_d.jpg"
-texture n "textures/yves_allaire/ex/trim_baseboard_local.png"
-texture s "textures/yves_allaire/ex/trim_baseboard_s.jpg"
-texture z "textures/yves_allaire/ex/trim_baseboard_h.jpg"
+texture 0 "textures/ex/trim_baseboard_d.png"
+texture n "textures/ex/trim_baseboard_local.png"
+texture s "textures/ex/trim_baseboard_s.png"
+texture z "textures/ex/trim_baseboard_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_psimple_04_d.jpg"
-texture n "textures/yves_allaire/ex/trim_psimple_04_local.png"
-texture s "textures/yves_allaire/ex/trim_psimple_04_s.jpg"
-texture z "textures/yves_allaire/ex/trim_psimple_04_h.jpg"
+texture 0 "textures/ex/trim_psimple_04_d.png"
+texture n "textures/ex/trim_psimple_04_local.png"
+texture s "textures/ex/trim_psimple_04_s.png"
+texture z "textures/ex/trim_psimple_04_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_psimple_05_d.jpg"
-texture n "textures/yves_allaire/ex/trim_psimple_05_local.png"
-texture s "textures/yves_allaire/ex/trim_psimple_05_s.jpg"
-texture z "textures/yves_allaire/ex/trim_psimple_05_h.jpg"
+texture 0 "textures/ex/trim_psimple_05_d.png"
+texture n "textures/ex/trim_psimple_05_local.png"
+texture s "textures/ex/trim_psimple_05_s.png"
+texture z "textures/ex/trim_psimple_05_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_simple_01_d.jpg"
-texture n "textures/yves_allaire/ex/trim_simple_01_local.png"
-texture s "textures/yves_allaire/ex/trim_simple_01_s.jpg"
-texture z "textures/yves_allaire/ex/trim_simple_01_h.jpg"
+texture 0 "textures/ex/trim_simple_01_d.png"
+texture n "textures/ex/trim_simple_01_local.png"
+texture s "textures/ex/trim_simple_01_s.png"
+texture z "textures/ex/trim_simple_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_simple03_d.jpg"
-texture n "textures/yves_allaire/ex/trim_simple03_local.png"
-texture s "textures/yves_allaire/ex/trim_simple03_s.jpg"
-texture z "textures/yves_allaire/ex/trim_simple03_h.jpg"
+texture 0 "textures/ex/trim_simple03_d.png"
+texture n "textures/ex/trim_simple03_local.png"
+texture s "textures/ex/trim_simple03_s.png"
+texture z "textures/ex/trim_simple03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_support_03_d.jpg"
-texture n "textures/yves_allaire/ex/trim_support_03_local.png"
-texture s "textures/yves_allaire/ex/trim_support_03_s.jpg"
-texture z "textures/yves_allaire/ex/trim_support_03_h.jpg"
+texture 0 "textures/ex/trim_support_03_d.png"
+texture n "textures/ex/trim_support_03_local.png"
+texture s "textures/ex/trim_support_03_s.png"
+texture z "textures/ex/trim_support_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/trim_vert_01_d.jpg"
-texture n "textures/yves_allaire/ex/trim_vert_01_local.png"
-texture s "textures/yves_allaire/ex/trim_vert_01_s.jpg"
-texture z "textures/yves_allaire/ex/trim_vert_01_h.jpg"
+texture 0 "textures/ex/trim_vert_01_d.png"
+texture n "textures/ex/trim_vert_01_local.png"
+texture s "textures/ex/trim_vert_01_s.png"
+texture z "textures/ex/trim_vert_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_01_d.jpg"
-texture n "textures/yves_allaire/ex/wall_01_local.png"
-texture s "textures/yves_allaire/ex/wall_01_s.jpg"
-texture z "textures/yves_allaire/ex/wall_01_h.jpg"
+texture 0 "textures/ex/wall_01_d.png"
+texture n "textures/ex/wall_01_local.png"
+texture s "textures/ex/wall_01_s.png"
+texture z "textures/ex/wall_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_01b_d.jpg"
-texture n "textures/yves_allaire/ex/wall_01_local.png"
-texture s "textures/yves_allaire/ex/wall_01_s.jpg"
-texture z "textures/yves_allaire/ex/wall_01_h.jpg"
+texture 0 "textures/ex/wall_01b_d.png"
+texture n "textures/ex/wall_01_local.png"
+texture s "textures/ex/wall_01_s.png"
+texture z "textures/ex/wall_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_b01_d.jpg"
-texture n "textures/yves_allaire/ex/wall_b01_local.png"
-texture s "textures/yves_allaire/ex/wall_b01_s.jpg"
-texture z "textures/yves_allaire/ex/wall_b01_h.jpg"
+texture 0 "textures/ex/wall_b01_d.png"
+texture n "textures/ex/wall_b01_local.png"
+texture s "textures/ex/wall_b01_s.png"
+texture z "textures/ex/wall_b01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_bigrib_02_d.jpg"
-texture n "textures/yves_allaire/ex/wall_bigrib_02_local.png"
-texture s "textures/yves_allaire/ex/wall_bigrib_02_s.jpg"
-texture z "textures/yves_allaire/ex/wall_bigrib_02_h.jpg"
+texture 0 "textures/ex/wall_bigrib_02_d.png"
+texture n "textures/ex/wall_bigrib_02_local.png"
+texture s "textures/ex/wall_bigrib_02_s.png"
+texture z "textures/ex/wall_bigrib_02_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_bplate_06_d.jpg"
-texture n "textures/yves_allaire/ex/wall_bplate_06_local.png"
-texture s "textures/yves_allaire/ex/wall_bplate_06_s.jpg"
-texture z "textures/yves_allaire/ex/wall_bplate_06_h.jpg"
+texture 0 "textures/ex/wall_bplate_06_d.png"
+texture n "textures/ex/wall_bplate_06_local.png"
+texture s "textures/ex/wall_bplate_06_s.png"
+texture z "textures/ex/wall_bplate_06_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_panel_05_d.jpg"
-texture n "textures/yves_allaire/ex/wall_panel_05_local.png"
-texture s "textures/yves_allaire/ex/wall_panel_05_s.jpg"
-texture z "textures/yves_allaire/ex/wall_panel_05_h.jpg"
+texture 0 "textures/ex/wall_panel_05_d.png"
+texture n "textures/ex/wall_panel_05_local.png"
+texture s "textures/ex/wall_panel_05_s.png"
+texture z "textures/ex/wall_panel_05_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_panels_08_d.jpg"
-texture n "textures/yves_allaire/ex/wall_panels_08_local.png"
-texture s "textures/yves_allaire/ex/wall_panels_08_s.jpg"
-texture z "textures/yves_allaire/ex/wall_panels_08_h.jpg"
+texture 0 "textures/ex/wall_panels_08_d.png"
+texture n "textures/ex/wall_panels_08_local.png"
+texture s "textures/ex/wall_panels_08_s.png"
+texture z "textures/ex/wall_panels_08_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/wall_panels_08b_d.jpg"
-texture n "textures/yves_allaire/ex/wall_panels_08b_local.png"
-texture s "textures/yves_allaire/ex/wall_panels_08b_s.jpg"
-texture z "textures/yves_allaire/ex/wall_panels_08b_h.jpg"
+texture 0 "textures/ex/wall_panels_08b_d.png"
+texture n "textures/ex/wall_panels_08b_local.png"
+texture s "textures/ex/wall_panels_08b_s.png"
+texture z "textures/ex/wall_panels_08b_h.png"
texscale 0.5
setshader bumpspecmapworld
-setshaderparam specscale 2 2 2
+setshaderparam specscale 0.6 0.6 0.6
-texture 0 "textures/yves_allaire/ex/wall_pipe_d.jpg"
-texture n "textures/yves_allaire/ex/wall_pipe_local.png"
-texture s "textures/yves_allaire/ex/wall_pipe_s.jpg"
+texture 0 "textures/ex/wall_pipe_d.png"
+texture n "textures/ex/wall_pipe_local.png"
+texture s "textures/ex/wall_pipe_s.png"
texscale 0.5
setshader bumpspecmapparallaxworld
-setshaderparam specscale 2 2 2
+setshaderparam specscale 0.6 0.6 0.6
setshaderparam parallaxscale 0.04 -0.02
-texture 0 "textures/yves_allaire/ex/wall_u207_d.jpg"
-texture n "textures/yves_allaire/ex/wall_u207_local.png"
-texture s "textures/yves_allaire/ex/wall_u207_s.jpg"
-texture z "textures/yves_allaire/ex/wall_u207_h.jpg"
+texture 0 "textures/ex/wall_u207_d.png"
+texture n "textures/ex/wall_u207_local.png"
+texture s "textures/ex/wall_u207_s.png"
+texture z "textures/ex/wall_u207_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_plate_01_d.jpg"
-texture n "textures/yves_allaire/ex/metal_plate_01_local.png"
-texture s "textures/yves_allaire/ex/metal_plate_01_s.jpg"
-texture z "textures/yves_allaire/ex/metal_plate_01_h.jpg"
+texture 0 "textures/ex/metal_plate_01_d.png"
+texture n "textures/ex/metal_plate_01_local.png"
+texture s "textures/ex/metal_plate_01_s.png"
+texture z "textures/ex/metal_plate_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_plate_01b_d.jpg"
-texture n "textures/yves_allaire/ex/metal_plate_01b_local.png"
-texture s "textures/yves_allaire/ex/metal_plate_01b_s.jpg"
-texture z "textures/yves_allaire/ex/metal_plate_01b_h.jpg"
+texture 0 "textures/ex/metal_plate_01b_d.png"
+texture n "textures/ex/metal_plate_01b_local.png"
+texture s "textures/ex/metal_plate_01b_s.png"
+texture z "textures/ex/metal_plate_01b_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_plate_01c_d.jpg"
-texture n "textures/yves_allaire/ex/metal_plate_01c_local.png"
-texture s "textures/yves_allaire/ex/metal_plate_01c_s.jpg"
-texture z "textures/yves_allaire/ex/metal_plate_01c_h.jpg"
+texture 0 "textures/ex/metal_plate_01c_d.png"
+texture n "textures/ex/metal_plate_01c_local.png"
+texture s "textures/ex/metal_plate_01c_s.png"
+texture z "textures/ex/metal_plate_01c_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_base_01_d.jpg"
-texture n "textures/yves_allaire/ex/metal_base_01_local.png"
-texture s "textures/yves_allaire/ex/metal_base_01_s.jpg"
-texture z "textures/yves_allaire/ex/metal_base_01_h.jpg"
+texture 0 "textures/ex/metal_base_01_d.png"
+texture n "textures/ex/metal_base_01_local.png"
+texture s "textures/ex/metal_base_01_s.png"
+texture z "textures/ex/metal_base_01_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_base_02_d.jpg"
-texture n "textures/yves_allaire/ex/metal_base_02_local.png"
-texture s "textures/yves_allaire/ex/metal_base_02_s.jpg"
-texture z "textures/yves_allaire/ex/metal_base_02_h.jpg"
+texture 0 "textures/ex/metal_base_02_d.png"
+texture n "textures/ex/metal_base_02_local.png"
+texture s "textures/ex/metal_base_02_s.png"
+texture z "textures/ex/metal_base_02_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_base_03_d.jpg"
-texture n "textures/yves_allaire/ex/metal_base_03_local.png"
-texture s "textures/yves_allaire/ex/metal_base_03_s.jpg"
-texture z "textures/yves_allaire/ex/metal_base_03_h.jpg"
+texture 0 "textures/ex/metal_base_03_d.png"
+texture n "textures/ex/metal_base_03_local.png"
+texture s "textures/ex/metal_base_03_s.png"
+texture z "textures/ex/metal_base_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_base_04_d.jpg"
-texture n "textures/yves_allaire/ex/metal_base_03_local.png"
-texture s "textures/yves_allaire/ex/metal_base_03_s.jpg"
-texture z "textures/yves_allaire/ex/metal_base_03_h.jpg"
+texture 0 "textures/ex/metal_base_04_d.png"
+texture n "textures/ex/metal_base_03_local.png"
+texture s "textures/ex/metal_base_03_s.png"
+texture z "textures/ex/metal_base_03_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_base_05_rust_d.jpg"
-texture n "textures/yves_allaire/ex/metal_base_05_rust_local.png"
-texture s "textures/yves_allaire/ex/metal_base_05_rust_s.jpg"
-texture z "textures/yves_allaire/ex/metal_base_05_rust_h.jpg"
+texture 0 "textures/ex/metal_base_05_rust_d.png"
+texture n "textures/ex/metal_base_05_rust_local.png"
+texture s "textures/ex/metal_base_05_rust_s.png"
+texture z "textures/ex/metal_base_05_rust_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_base_06_rust_d.jpg"
-texture n "textures/yves_allaire/ex/metal_base_05_rust_local.png"
-texture s "textures/yves_allaire/ex/metal_base_05_rust_s.jpg"
-texture z "textures/yves_allaire/ex/metal_base_05_rust_h.jpg"
+texture 0 "textures/ex/metal_base_06_rust_d.png"
+texture n "textures/ex/metal_base_05_rust_local.png"
+texture s "textures/ex/metal_base_05_rust_s.png"
+texture z "textures/ex/metal_base_05_rust_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_base_07_rust_d.jpg"
-texture n "textures/yves_allaire/ex/metal_base_05_rust_local.png"
-texture s "textures/yves_allaire/ex/metal_base_05_rust_s.jpg"
-texture z "textures/yves_allaire/ex/metal_base_05_rust_h.jpg"
+texture 0 "textures/ex/metal_base_07_rust_d.png"
+texture n "textures/ex/metal_base_05_rust_local.png"
+texture s "textures/ex/metal_base_05_rust_s.png"
+texture z "textures/ex/metal_base_05_rust_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_floor_02_d.jpg"
-texture n "textures/yves_allaire/ex/metal_floor_02_local.png"
-texture s "textures/yves_allaire/ex/metal_floor_02_s.jpg"
-texture z "textures/yves_allaire/ex/metal_floor_02_h.jpg"
+texture 0 "textures/ex/metal_floor_02_d.png"
+texture n "textures/ex/metal_floor_02_local.png"
+texture s "textures/ex/metal_floor_02_s.png"
+texture z "textures/ex/metal_floor_02_h.png"
texscale 0.5
-texture 0 "textures/yves_allaire/ex/metal_rib_01_d.jpg"
-texture n "textures/yves_allaire/ex/metal_rib_01_local.png"
-texture s "textures/yves_allaire/ex/metal_rib_01_s.jpg"
-texture z "textures/yves_allaire/ex/metal_rib_01_h.jpg"
+texture 0 "textures/ex/metal_rib_01_d.png"
+texture n "textures/ex/metal_rib_01_local.png"
+texture s "textures/ex/metal_rib_01_s.png"
+texture z "textures/ex/metal_rib_01_h.png"
texscale 0.5
diff --git a/packages/textures/ex/q2_01_d.jpg b/packages/textures/ex/q2_01_d.jpg Binary files differdeleted file mode 100644 index 1cfde84..0000000 --- a/packages/textures/ex/q2_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01_d.png b/packages/textures/ex/q2_01_d.png Binary files differnew file mode 100644 index 0000000..d29e4f3 --- /dev/null +++ b/packages/textures/ex/q2_01_d.png diff --git a/packages/textures/ex/q2_01_h.jpg b/packages/textures/ex/q2_01_h.jpg Binary files differdeleted file mode 100644 index cbfdad2..0000000 --- a/packages/textures/ex/q2_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01_h.png b/packages/textures/ex/q2_01_h.png Binary files differnew file mode 100644 index 0000000..b796795 --- /dev/null +++ b/packages/textures/ex/q2_01_h.png diff --git a/packages/textures/ex/q2_01_s.jpg b/packages/textures/ex/q2_01_s.jpg Binary files differdeleted file mode 100644 index 1151ee9..0000000 --- a/packages/textures/ex/q2_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01_s.png b/packages/textures/ex/q2_01_s.png Binary files differnew file mode 100644 index 0000000..93a1e6c --- /dev/null +++ b/packages/textures/ex/q2_01_s.png diff --git a/packages/textures/ex/q2_01b_d.jpg b/packages/textures/ex/q2_01b_d.jpg Binary files differdeleted file mode 100644 index 975d9f5..0000000 --- a/packages/textures/ex/q2_01b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01b_d.png b/packages/textures/ex/q2_01b_d.png Binary files differnew file mode 100644 index 0000000..bf78dac --- /dev/null +++ b/packages/textures/ex/q2_01b_d.png diff --git a/packages/textures/ex/q2_01b_h.jpg b/packages/textures/ex/q2_01b_h.jpg Binary files differdeleted file mode 100644 index e51f889..0000000 --- a/packages/textures/ex/q2_01b_h.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01b_h.png b/packages/textures/ex/q2_01b_h.png Binary files differnew file mode 100644 index 0000000..3a515b2 --- /dev/null +++ b/packages/textures/ex/q2_01b_h.png diff --git a/packages/textures/ex/q2_01b_s.jpg b/packages/textures/ex/q2_01b_s.jpg Binary files differdeleted file mode 100644 index 23228cd..0000000 --- a/packages/textures/ex/q2_01b_s.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01b_s.png b/packages/textures/ex/q2_01b_s.png Binary files differnew file mode 100644 index 0000000..ed69b77 --- /dev/null +++ b/packages/textures/ex/q2_01b_s.png diff --git a/packages/textures/ex/q2_01c_d.jpg b/packages/textures/ex/q2_01c_d.jpg Binary files differdeleted file mode 100644 index dac8573..0000000 --- a/packages/textures/ex/q2_01c_d.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01c_d.png b/packages/textures/ex/q2_01c_d.png Binary files differnew file mode 100644 index 0000000..b22b0d9 --- /dev/null +++ b/packages/textures/ex/q2_01c_d.png diff --git a/packages/textures/ex/q2_01c_h.jpg b/packages/textures/ex/q2_01c_h.jpg Binary files differdeleted file mode 100644 index 4a836f6..0000000 --- a/packages/textures/ex/q2_01c_h.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01c_h.png b/packages/textures/ex/q2_01c_h.png Binary files differnew file mode 100644 index 0000000..2a85d33 --- /dev/null +++ b/packages/textures/ex/q2_01c_h.png diff --git a/packages/textures/ex/q2_01c_s.jpg b/packages/textures/ex/q2_01c_s.jpg Binary files differdeleted file mode 100644 index f5202a8..0000000 --- a/packages/textures/ex/q2_01c_s.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01c_s.png b/packages/textures/ex/q2_01c_s.png Binary files differnew file mode 100644 index 0000000..a134352 --- /dev/null +++ b/packages/textures/ex/q2_01c_s.png diff --git a/packages/textures/ex/q2_01d_d.jpg b/packages/textures/ex/q2_01d_d.jpg Binary files differdeleted file mode 100644 index d0af7f4..0000000 --- a/packages/textures/ex/q2_01d_d.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01d_d.png b/packages/textures/ex/q2_01d_d.png Binary files differnew file mode 100644 index 0000000..c4001b3 --- /dev/null +++ b/packages/textures/ex/q2_01d_d.png diff --git a/packages/textures/ex/q2_01d_h.jpg b/packages/textures/ex/q2_01d_h.jpg Binary files differdeleted file mode 100644 index f668db0..0000000 --- a/packages/textures/ex/q2_01d_h.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01d_h.png b/packages/textures/ex/q2_01d_h.png Binary files differnew file mode 100644 index 0000000..6b4b895 --- /dev/null +++ b/packages/textures/ex/q2_01d_h.png diff --git a/packages/textures/ex/q2_01d_s.jpg b/packages/textures/ex/q2_01d_s.jpg Binary files differdeleted file mode 100644 index 0fbbd9b..0000000 --- a/packages/textures/ex/q2_01d_s.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01d_s.png b/packages/textures/ex/q2_01d_s.png Binary files differnew file mode 100644 index 0000000..a975ffd --- /dev/null +++ b/packages/textures/ex/q2_01d_s.png diff --git a/packages/textures/ex/q2_01e_d.jpg b/packages/textures/ex/q2_01e_d.jpg Binary files differdeleted file mode 100644 index 42286b9..0000000 --- a/packages/textures/ex/q2_01e_d.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01e_d.png b/packages/textures/ex/q2_01e_d.png Binary files differnew file mode 100644 index 0000000..b317d4b --- /dev/null +++ b/packages/textures/ex/q2_01e_d.png diff --git a/packages/textures/ex/q2_01e_h.jpg b/packages/textures/ex/q2_01e_h.jpg Binary files differdeleted file mode 100644 index 6ab5bd0..0000000 --- a/packages/textures/ex/q2_01e_h.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01e_h.png b/packages/textures/ex/q2_01e_h.png Binary files differnew file mode 100644 index 0000000..33e3302 --- /dev/null +++ b/packages/textures/ex/q2_01e_h.png diff --git a/packages/textures/ex/q2_01e_s.jpg b/packages/textures/ex/q2_01e_s.jpg Binary files differdeleted file mode 100644 index 067cc85..0000000 --- a/packages/textures/ex/q2_01e_s.jpg +++ /dev/null diff --git a/packages/textures/ex/q2_01e_s.png b/packages/textures/ex/q2_01e_s.png Binary files differnew file mode 100644 index 0000000..9ddfddd --- /dev/null +++ b/packages/textures/ex/q2_01e_s.png diff --git a/packages/textures/ex/rndfloor_01_d.jpg b/packages/textures/ex/rndfloor_01_d.jpg Binary files differdeleted file mode 100644 index fb3f99b..0000000 --- a/packages/textures/ex/rndfloor_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/rndfloor_01_d.png b/packages/textures/ex/rndfloor_01_d.png Binary files differnew file mode 100644 index 0000000..a586d9c --- /dev/null +++ b/packages/textures/ex/rndfloor_01_d.png diff --git a/packages/textures/ex/rndfloor_01_h.jpg b/packages/textures/ex/rndfloor_01_h.jpg Binary files differdeleted file mode 100644 index 61a480c..0000000 --- a/packages/textures/ex/rndfloor_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/rndfloor_01_h.png b/packages/textures/ex/rndfloor_01_h.png Binary files differnew file mode 100644 index 0000000..6510d30 --- /dev/null +++ b/packages/textures/ex/rndfloor_01_h.png diff --git a/packages/textures/ex/rndfloor_01_s.jpg b/packages/textures/ex/rndfloor_01_s.jpg Binary files differdeleted file mode 100644 index 7e8be11..0000000 --- a/packages/textures/ex/rndfloor_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/rndfloor_01_s.png b/packages/textures/ex/rndfloor_01_s.png Binary files differnew file mode 100644 index 0000000..89a1a84 --- /dev/null +++ b/packages/textures/ex/rndfloor_01_s.png diff --git a/packages/textures/ex/rndfloor_02_d.jpg b/packages/textures/ex/rndfloor_02_d.jpg Binary files differdeleted file mode 100644 index d4844f9..0000000 --- a/packages/textures/ex/rndfloor_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/rndfloor_02_d.png b/packages/textures/ex/rndfloor_02_d.png Binary files differnew file mode 100644 index 0000000..49562ad --- /dev/null +++ b/packages/textures/ex/rndfloor_02_d.png diff --git a/packages/textures/ex/rndfloor_02_h.jpg b/packages/textures/ex/rndfloor_02_h.jpg Binary files differdeleted file mode 100644 index c427a7f..0000000 --- a/packages/textures/ex/rndfloor_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/rndfloor_02_h.png b/packages/textures/ex/rndfloor_02_h.png Binary files differnew file mode 100644 index 0000000..3b55a12 --- /dev/null +++ b/packages/textures/ex/rndfloor_02_h.png diff --git a/packages/textures/ex/rndfloor_02_s.jpg b/packages/textures/ex/rndfloor_02_s.jpg Binary files differdeleted file mode 100644 index 436d7a1..0000000 --- a/packages/textures/ex/rndfloor_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/rndfloor_02_s.png b/packages/textures/ex/rndfloor_02_s.png Binary files differnew file mode 100644 index 0000000..a9daaa3 --- /dev/null +++ b/packages/textures/ex/rndfloor_02_s.png diff --git a/packages/textures/ex/rplates_01_d.jpg b/packages/textures/ex/rplates_01_d.jpg Binary files differdeleted file mode 100644 index a72c363..0000000 --- a/packages/textures/ex/rplates_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/rplates_01_d.png b/packages/textures/ex/rplates_01_d.png Binary files differnew file mode 100644 index 0000000..51aa0a4 --- /dev/null +++ b/packages/textures/ex/rplates_01_d.png diff --git a/packages/textures/ex/rplates_01_h.jpg b/packages/textures/ex/rplates_01_h.jpg Binary files differdeleted file mode 100644 index b3407ae..0000000 --- a/packages/textures/ex/rplates_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/rplates_01_h.png b/packages/textures/ex/rplates_01_h.png Binary files differnew file mode 100644 index 0000000..55033c1 --- /dev/null +++ b/packages/textures/ex/rplates_01_h.png diff --git a/packages/textures/ex/rplates_01_s.jpg b/packages/textures/ex/rplates_01_s.jpg Binary files differdeleted file mode 100644 index acdef4e..0000000 --- a/packages/textures/ex/rplates_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/rplates_01_s.png b/packages/textures/ex/rplates_01_s.png Binary files differnew file mode 100644 index 0000000..a9cff58 --- /dev/null +++ b/packages/textures/ex/rplates_01_s.png diff --git a/packages/textures/ex/steptop_01_d.jpg b/packages/textures/ex/steptop_01_d.jpg Binary files differdeleted file mode 100644 index f5164a2..0000000 --- a/packages/textures/ex/steptop_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/steptop_01_d.png b/packages/textures/ex/steptop_01_d.png Binary files differnew file mode 100644 index 0000000..93ed1f8 --- /dev/null +++ b/packages/textures/ex/steptop_01_d.png diff --git a/packages/textures/ex/steptop_01_h.jpg b/packages/textures/ex/steptop_01_h.jpg Binary files differdeleted file mode 100644 index 896e89e..0000000 --- a/packages/textures/ex/steptop_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/steptop_01_h.png b/packages/textures/ex/steptop_01_h.png Binary files differnew file mode 100644 index 0000000..4aa9403 --- /dev/null +++ b/packages/textures/ex/steptop_01_h.png diff --git a/packages/textures/ex/steptop_01_s.jpg b/packages/textures/ex/steptop_01_s.jpg Binary files differdeleted file mode 100644 index c309cbe..0000000 --- a/packages/textures/ex/steptop_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/steptop_01_s.png b/packages/textures/ex/steptop_01_s.png Binary files differnew file mode 100644 index 0000000..f3fa8b3 --- /dev/null +++ b/packages/textures/ex/steptop_01_s.png diff --git a/packages/textures/ex/trim_01_d.jpg b/packages/textures/ex/trim_01_d.jpg Binary files differdeleted file mode 100644 index 43842c4..0000000 --- a/packages/textures/ex/trim_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_01_d.png b/packages/textures/ex/trim_01_d.png Binary files differnew file mode 100644 index 0000000..900bd31 --- /dev/null +++ b/packages/textures/ex/trim_01_d.png diff --git a/packages/textures/ex/trim_01_h.jpg b/packages/textures/ex/trim_01_h.jpg Binary files differdeleted file mode 100644 index c1ced40..0000000 --- a/packages/textures/ex/trim_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_01_h.png b/packages/textures/ex/trim_01_h.png Binary files differnew file mode 100644 index 0000000..50dd19d --- /dev/null +++ b/packages/textures/ex/trim_01_h.png diff --git a/packages/textures/ex/trim_01_s.jpg b/packages/textures/ex/trim_01_s.jpg Binary files differdeleted file mode 100644 index 69724bd..0000000 --- a/packages/textures/ex/trim_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_01_s.png b/packages/textures/ex/trim_01_s.png Binary files differnew file mode 100644 index 0000000..98391cc --- /dev/null +++ b/packages/textures/ex/trim_01_s.png diff --git a/packages/textures/ex/trim_baseboard_02_d.jpg b/packages/textures/ex/trim_baseboard_02_d.jpg Binary files differdeleted file mode 100644 index c5351cc..0000000 --- a/packages/textures/ex/trim_baseboard_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_02_d.png b/packages/textures/ex/trim_baseboard_02_d.png Binary files differnew file mode 100644 index 0000000..dd1def4 --- /dev/null +++ b/packages/textures/ex/trim_baseboard_02_d.png diff --git a/packages/textures/ex/trim_baseboard_02_h.jpg b/packages/textures/ex/trim_baseboard_02_h.jpg Binary files differdeleted file mode 100644 index 1c9c7f1..0000000 --- a/packages/textures/ex/trim_baseboard_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_02_h.png b/packages/textures/ex/trim_baseboard_02_h.png Binary files differnew file mode 100644 index 0000000..2a69edb --- /dev/null +++ b/packages/textures/ex/trim_baseboard_02_h.png diff --git a/packages/textures/ex/trim_baseboard_02_s.jpg b/packages/textures/ex/trim_baseboard_02_s.jpg Binary files differdeleted file mode 100644 index 7a30f21..0000000 --- a/packages/textures/ex/trim_baseboard_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_02_s.png b/packages/textures/ex/trim_baseboard_02_s.png Binary files differnew file mode 100644 index 0000000..8661ba1 --- /dev/null +++ b/packages/textures/ex/trim_baseboard_02_s.png diff --git a/packages/textures/ex/trim_baseboard_03_d.jpg b/packages/textures/ex/trim_baseboard_03_d.jpg Binary files differdeleted file mode 100644 index 0e8fb71..0000000 --- a/packages/textures/ex/trim_baseboard_03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_03_d.png b/packages/textures/ex/trim_baseboard_03_d.png Binary files differnew file mode 100644 index 0000000..4fb2a52 --- /dev/null +++ b/packages/textures/ex/trim_baseboard_03_d.png diff --git a/packages/textures/ex/trim_baseboard_03_h.jpg b/packages/textures/ex/trim_baseboard_03_h.jpg Binary files differdeleted file mode 100644 index 75984f2..0000000 --- a/packages/textures/ex/trim_baseboard_03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_03_h.png b/packages/textures/ex/trim_baseboard_03_h.png Binary files differnew file mode 100644 index 0000000..a914c05 --- /dev/null +++ b/packages/textures/ex/trim_baseboard_03_h.png diff --git a/packages/textures/ex/trim_baseboard_03_s.jpg b/packages/textures/ex/trim_baseboard_03_s.jpg Binary files differdeleted file mode 100644 index fcdc50d..0000000 --- a/packages/textures/ex/trim_baseboard_03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_03_s.png b/packages/textures/ex/trim_baseboard_03_s.png Binary files differnew file mode 100644 index 0000000..0fc1fdd --- /dev/null +++ b/packages/textures/ex/trim_baseboard_03_s.png diff --git a/packages/textures/ex/trim_baseboard_d.jpg b/packages/textures/ex/trim_baseboard_d.jpg Binary files differdeleted file mode 100644 index 46387e8..0000000 --- a/packages/textures/ex/trim_baseboard_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_d.png b/packages/textures/ex/trim_baseboard_d.png Binary files differnew file mode 100644 index 0000000..369613d --- /dev/null +++ b/packages/textures/ex/trim_baseboard_d.png diff --git a/packages/textures/ex/trim_baseboard_h.jpg b/packages/textures/ex/trim_baseboard_h.jpg Binary files differdeleted file mode 100644 index ea7ddf6..0000000 --- a/packages/textures/ex/trim_baseboard_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_h.png b/packages/textures/ex/trim_baseboard_h.png Binary files differnew file mode 100644 index 0000000..a99f4c2 --- /dev/null +++ b/packages/textures/ex/trim_baseboard_h.png diff --git a/packages/textures/ex/trim_baseboard_s.jpg b/packages/textures/ex/trim_baseboard_s.jpg Binary files differdeleted file mode 100644 index c23067f..0000000 --- a/packages/textures/ex/trim_baseboard_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_baseboard_s.png b/packages/textures/ex/trim_baseboard_s.png Binary files differnew file mode 100644 index 0000000..050569d --- /dev/null +++ b/packages/textures/ex/trim_baseboard_s.png diff --git a/packages/textures/ex/trim_psimple_04_d.jpg b/packages/textures/ex/trim_psimple_04_d.jpg Binary files differdeleted file mode 100644 index f2c425a..0000000 --- a/packages/textures/ex/trim_psimple_04_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_psimple_04_d.png b/packages/textures/ex/trim_psimple_04_d.png Binary files differnew file mode 100644 index 0000000..6a8f1e1 --- /dev/null +++ b/packages/textures/ex/trim_psimple_04_d.png diff --git a/packages/textures/ex/trim_psimple_04_h.jpg b/packages/textures/ex/trim_psimple_04_h.jpg Binary files differdeleted file mode 100644 index 608f6d6..0000000 --- a/packages/textures/ex/trim_psimple_04_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_psimple_04_h.png b/packages/textures/ex/trim_psimple_04_h.png Binary files differnew file mode 100644 index 0000000..9a325c6 --- /dev/null +++ b/packages/textures/ex/trim_psimple_04_h.png diff --git a/packages/textures/ex/trim_psimple_04_s.jpg b/packages/textures/ex/trim_psimple_04_s.jpg Binary files differdeleted file mode 100644 index c280f4e..0000000 --- a/packages/textures/ex/trim_psimple_04_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_psimple_04_s.png b/packages/textures/ex/trim_psimple_04_s.png Binary files differnew file mode 100644 index 0000000..96ac4ff --- /dev/null +++ b/packages/textures/ex/trim_psimple_04_s.png diff --git a/packages/textures/ex/trim_psimple_05_d.jpg b/packages/textures/ex/trim_psimple_05_d.jpg Binary files differdeleted file mode 100644 index 96c3c09..0000000 --- a/packages/textures/ex/trim_psimple_05_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_psimple_05_d.png b/packages/textures/ex/trim_psimple_05_d.png Binary files differnew file mode 100644 index 0000000..fb12466 --- /dev/null +++ b/packages/textures/ex/trim_psimple_05_d.png diff --git a/packages/textures/ex/trim_psimple_05_h.jpg b/packages/textures/ex/trim_psimple_05_h.jpg Binary files differdeleted file mode 100644 index aeb51f2..0000000 --- a/packages/textures/ex/trim_psimple_05_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_psimple_05_h.png b/packages/textures/ex/trim_psimple_05_h.png Binary files differnew file mode 100644 index 0000000..a1a9b77 --- /dev/null +++ b/packages/textures/ex/trim_psimple_05_h.png diff --git a/packages/textures/ex/trim_psimple_05_s.jpg b/packages/textures/ex/trim_psimple_05_s.jpg Binary files differdeleted file mode 100644 index dc5aefa..0000000 --- a/packages/textures/ex/trim_psimple_05_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_psimple_05_s.png b/packages/textures/ex/trim_psimple_05_s.png Binary files differnew file mode 100644 index 0000000..f8f4ee2 --- /dev/null +++ b/packages/textures/ex/trim_psimple_05_s.png diff --git a/packages/textures/ex/trim_simple03_d.jpg b/packages/textures/ex/trim_simple03_d.jpg Binary files differdeleted file mode 100644 index 5360a2b..0000000 --- a/packages/textures/ex/trim_simple03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_simple03_d.png b/packages/textures/ex/trim_simple03_d.png Binary files differnew file mode 100644 index 0000000..050dce4 --- /dev/null +++ b/packages/textures/ex/trim_simple03_d.png diff --git a/packages/textures/ex/trim_simple03_h.jpg b/packages/textures/ex/trim_simple03_h.jpg Binary files differdeleted file mode 100644 index 799ff02..0000000 --- a/packages/textures/ex/trim_simple03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_simple03_h.png b/packages/textures/ex/trim_simple03_h.png Binary files differnew file mode 100644 index 0000000..067e751 --- /dev/null +++ b/packages/textures/ex/trim_simple03_h.png diff --git a/packages/textures/ex/trim_simple03_s.jpg b/packages/textures/ex/trim_simple03_s.jpg Binary files differdeleted file mode 100644 index 9f9f2b7..0000000 --- a/packages/textures/ex/trim_simple03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_simple03_s.png b/packages/textures/ex/trim_simple03_s.png Binary files differnew file mode 100644 index 0000000..3730b82 --- /dev/null +++ b/packages/textures/ex/trim_simple03_s.png diff --git a/packages/textures/ex/trim_simple_01_d.jpg b/packages/textures/ex/trim_simple_01_d.jpg Binary files differdeleted file mode 100644 index f712893..0000000 --- a/packages/textures/ex/trim_simple_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_simple_01_d.png b/packages/textures/ex/trim_simple_01_d.png Binary files differnew file mode 100644 index 0000000..06a0260 --- /dev/null +++ b/packages/textures/ex/trim_simple_01_d.png diff --git a/packages/textures/ex/trim_simple_01_h.jpg b/packages/textures/ex/trim_simple_01_h.jpg Binary files differdeleted file mode 100644 index cefe222..0000000 --- a/packages/textures/ex/trim_simple_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_simple_01_h.png b/packages/textures/ex/trim_simple_01_h.png Binary files differnew file mode 100644 index 0000000..93a9cc3 --- /dev/null +++ b/packages/textures/ex/trim_simple_01_h.png diff --git a/packages/textures/ex/trim_simple_01_s.jpg b/packages/textures/ex/trim_simple_01_s.jpg Binary files differdeleted file mode 100644 index cf36328..0000000 --- a/packages/textures/ex/trim_simple_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_simple_01_s.png b/packages/textures/ex/trim_simple_01_s.png Binary files differnew file mode 100644 index 0000000..998181e --- /dev/null +++ b/packages/textures/ex/trim_simple_01_s.png diff --git a/packages/textures/ex/trim_support_03_d.jpg b/packages/textures/ex/trim_support_03_d.jpg Binary files differdeleted file mode 100644 index 55c5edf..0000000 --- a/packages/textures/ex/trim_support_03_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_support_03_d.png b/packages/textures/ex/trim_support_03_d.png Binary files differnew file mode 100644 index 0000000..acab451 --- /dev/null +++ b/packages/textures/ex/trim_support_03_d.png diff --git a/packages/textures/ex/trim_support_03_h.jpg b/packages/textures/ex/trim_support_03_h.jpg Binary files differdeleted file mode 100644 index de5c4e9..0000000 --- a/packages/textures/ex/trim_support_03_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_support_03_h.png b/packages/textures/ex/trim_support_03_h.png Binary files differnew file mode 100644 index 0000000..be895e9 --- /dev/null +++ b/packages/textures/ex/trim_support_03_h.png diff --git a/packages/textures/ex/trim_support_03_s.jpg b/packages/textures/ex/trim_support_03_s.jpg Binary files differdeleted file mode 100644 index 9457c40..0000000 --- a/packages/textures/ex/trim_support_03_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_support_03_s.png b/packages/textures/ex/trim_support_03_s.png Binary files differnew file mode 100644 index 0000000..c0032fe --- /dev/null +++ b/packages/textures/ex/trim_support_03_s.png diff --git a/packages/textures/ex/trim_vert_01_d.jpg b/packages/textures/ex/trim_vert_01_d.jpg Binary files differdeleted file mode 100644 index 9c731cd..0000000 --- a/packages/textures/ex/trim_vert_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_vert_01_d.png b/packages/textures/ex/trim_vert_01_d.png Binary files differnew file mode 100644 index 0000000..eb146b9 --- /dev/null +++ b/packages/textures/ex/trim_vert_01_d.png diff --git a/packages/textures/ex/trim_vert_01_h.jpg b/packages/textures/ex/trim_vert_01_h.jpg Binary files differdeleted file mode 100644 index 1907072..0000000 --- a/packages/textures/ex/trim_vert_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_vert_01_h.png b/packages/textures/ex/trim_vert_01_h.png Binary files differnew file mode 100644 index 0000000..caaa4de --- /dev/null +++ b/packages/textures/ex/trim_vert_01_h.png diff --git a/packages/textures/ex/trim_vert_01_s.jpg b/packages/textures/ex/trim_vert_01_s.jpg Binary files differdeleted file mode 100644 index dcd5b5b..0000000 --- a/packages/textures/ex/trim_vert_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/trim_vert_01_s.png b/packages/textures/ex/trim_vert_01_s.png Binary files differnew file mode 100644 index 0000000..de4cc5a --- /dev/null +++ b/packages/textures/ex/trim_vert_01_s.png diff --git a/packages/textures/ex/wall_01_d.jpg b/packages/textures/ex/wall_01_d.jpg Binary files differdeleted file mode 100644 index fd22d00..0000000 --- a/packages/textures/ex/wall_01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_01_d.png b/packages/textures/ex/wall_01_d.png Binary files differnew file mode 100644 index 0000000..b22a0dd --- /dev/null +++ b/packages/textures/ex/wall_01_d.png diff --git a/packages/textures/ex/wall_01_h.jpg b/packages/textures/ex/wall_01_h.jpg Binary files differdeleted file mode 100644 index 44abaef..0000000 --- a/packages/textures/ex/wall_01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_01_h.png b/packages/textures/ex/wall_01_h.png Binary files differnew file mode 100644 index 0000000..1f7c0d5 --- /dev/null +++ b/packages/textures/ex/wall_01_h.png diff --git a/packages/textures/ex/wall_01_s.jpg b/packages/textures/ex/wall_01_s.jpg Binary files differdeleted file mode 100644 index 309ac7f..0000000 --- a/packages/textures/ex/wall_01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_01_s.png b/packages/textures/ex/wall_01_s.png Binary files differnew file mode 100644 index 0000000..dcce4fd --- /dev/null +++ b/packages/textures/ex/wall_01_s.png diff --git a/packages/textures/ex/wall_01b_d.jpg b/packages/textures/ex/wall_01b_d.jpg Binary files differdeleted file mode 100644 index c22bb64..0000000 --- a/packages/textures/ex/wall_01b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_01b_d.png b/packages/textures/ex/wall_01b_d.png Binary files differnew file mode 100644 index 0000000..4305ee3 --- /dev/null +++ b/packages/textures/ex/wall_01b_d.png diff --git a/packages/textures/ex/wall_b01_d.jpg b/packages/textures/ex/wall_b01_d.jpg Binary files differdeleted file mode 100644 index 4f545d0..0000000 --- a/packages/textures/ex/wall_b01_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_b01_d.png b/packages/textures/ex/wall_b01_d.png Binary files differnew file mode 100644 index 0000000..e813890 --- /dev/null +++ b/packages/textures/ex/wall_b01_d.png diff --git a/packages/textures/ex/wall_b01_h.jpg b/packages/textures/ex/wall_b01_h.jpg Binary files differdeleted file mode 100644 index 6daca8b..0000000 --- a/packages/textures/ex/wall_b01_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_b01_h.png b/packages/textures/ex/wall_b01_h.png Binary files differnew file mode 100644 index 0000000..19d3096 --- /dev/null +++ b/packages/textures/ex/wall_b01_h.png diff --git a/packages/textures/ex/wall_b01_s.jpg b/packages/textures/ex/wall_b01_s.jpg Binary files differdeleted file mode 100644 index 6cd3239..0000000 --- a/packages/textures/ex/wall_b01_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_b01_s.png b/packages/textures/ex/wall_b01_s.png Binary files differnew file mode 100644 index 0000000..4929f2d --- /dev/null +++ b/packages/textures/ex/wall_b01_s.png diff --git a/packages/textures/ex/wall_bigrib_02_d.jpg b/packages/textures/ex/wall_bigrib_02_d.jpg Binary files differdeleted file mode 100644 index 98cac29..0000000 --- a/packages/textures/ex/wall_bigrib_02_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_bigrib_02_d.png b/packages/textures/ex/wall_bigrib_02_d.png Binary files differnew file mode 100644 index 0000000..b43cea2 --- /dev/null +++ b/packages/textures/ex/wall_bigrib_02_d.png diff --git a/packages/textures/ex/wall_bigrib_02_h.jpg b/packages/textures/ex/wall_bigrib_02_h.jpg Binary files differdeleted file mode 100644 index ca304e7..0000000 --- a/packages/textures/ex/wall_bigrib_02_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_bigrib_02_h.png b/packages/textures/ex/wall_bigrib_02_h.png Binary files differnew file mode 100644 index 0000000..4f03db2 --- /dev/null +++ b/packages/textures/ex/wall_bigrib_02_h.png diff --git a/packages/textures/ex/wall_bigrib_02_s.jpg b/packages/textures/ex/wall_bigrib_02_s.jpg Binary files differdeleted file mode 100644 index 5d85b80..0000000 --- a/packages/textures/ex/wall_bigrib_02_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_bigrib_02_s.png b/packages/textures/ex/wall_bigrib_02_s.png Binary files differnew file mode 100644 index 0000000..bd94ec9 --- /dev/null +++ b/packages/textures/ex/wall_bigrib_02_s.png diff --git a/packages/textures/ex/wall_bplate_06_d.jpg b/packages/textures/ex/wall_bplate_06_d.jpg Binary files differdeleted file mode 100644 index 55c9395..0000000 --- a/packages/textures/ex/wall_bplate_06_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_bplate_06_d.png b/packages/textures/ex/wall_bplate_06_d.png Binary files differnew file mode 100644 index 0000000..356b592 --- /dev/null +++ b/packages/textures/ex/wall_bplate_06_d.png diff --git a/packages/textures/ex/wall_bplate_06_h.jpg b/packages/textures/ex/wall_bplate_06_h.jpg Binary files differdeleted file mode 100644 index f2d6bd7..0000000 --- a/packages/textures/ex/wall_bplate_06_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_bplate_06_h.png b/packages/textures/ex/wall_bplate_06_h.png Binary files differnew file mode 100644 index 0000000..eee6556 --- /dev/null +++ b/packages/textures/ex/wall_bplate_06_h.png diff --git a/packages/textures/ex/wall_bplate_06_s.jpg b/packages/textures/ex/wall_bplate_06_s.jpg Binary files differdeleted file mode 100644 index 9714113..0000000 --- a/packages/textures/ex/wall_bplate_06_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_bplate_06_s.png b/packages/textures/ex/wall_bplate_06_s.png Binary files differnew file mode 100644 index 0000000..ded495f --- /dev/null +++ b/packages/textures/ex/wall_bplate_06_s.png diff --git a/packages/textures/ex/wall_panel_05_d.jpg b/packages/textures/ex/wall_panel_05_d.jpg Binary files differdeleted file mode 100644 index 5bf1ca7..0000000 --- a/packages/textures/ex/wall_panel_05_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panel_05_d.png b/packages/textures/ex/wall_panel_05_d.png Binary files differnew file mode 100644 index 0000000..716451f --- /dev/null +++ b/packages/textures/ex/wall_panel_05_d.png diff --git a/packages/textures/ex/wall_panel_05_h.jpg b/packages/textures/ex/wall_panel_05_h.jpg Binary files differdeleted file mode 100644 index 81a6446..0000000 --- a/packages/textures/ex/wall_panel_05_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panel_05_h.png b/packages/textures/ex/wall_panel_05_h.png Binary files differnew file mode 100644 index 0000000..fd2c014 --- /dev/null +++ b/packages/textures/ex/wall_panel_05_h.png diff --git a/packages/textures/ex/wall_panel_05_s.jpg b/packages/textures/ex/wall_panel_05_s.jpg Binary files differdeleted file mode 100644 index ac7448a..0000000 --- a/packages/textures/ex/wall_panel_05_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panel_05_s.png b/packages/textures/ex/wall_panel_05_s.png Binary files differnew file mode 100644 index 0000000..8ec569d --- /dev/null +++ b/packages/textures/ex/wall_panel_05_s.png diff --git a/packages/textures/ex/wall_panels_08_d.jpg b/packages/textures/ex/wall_panels_08_d.jpg Binary files differdeleted file mode 100644 index c0c9332..0000000 --- a/packages/textures/ex/wall_panels_08_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panels_08_d.png b/packages/textures/ex/wall_panels_08_d.png Binary files differnew file mode 100644 index 0000000..fde3f0c --- /dev/null +++ b/packages/textures/ex/wall_panels_08_d.png diff --git a/packages/textures/ex/wall_panels_08_h.jpg b/packages/textures/ex/wall_panels_08_h.jpg Binary files differdeleted file mode 100644 index 4942f9c..0000000 --- a/packages/textures/ex/wall_panels_08_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panels_08_h.png b/packages/textures/ex/wall_panels_08_h.png Binary files differnew file mode 100644 index 0000000..c5a892e --- /dev/null +++ b/packages/textures/ex/wall_panels_08_h.png diff --git a/packages/textures/ex/wall_panels_08_s.jpg b/packages/textures/ex/wall_panels_08_s.jpg Binary files differdeleted file mode 100644 index 35eeb08..0000000 --- a/packages/textures/ex/wall_panels_08_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panels_08_s.png b/packages/textures/ex/wall_panels_08_s.png Binary files differnew file mode 100644 index 0000000..69b47a6 --- /dev/null +++ b/packages/textures/ex/wall_panels_08_s.png diff --git a/packages/textures/ex/wall_panels_08b_d.jpg b/packages/textures/ex/wall_panels_08b_d.jpg Binary files differdeleted file mode 100644 index ff2103e..0000000 --- a/packages/textures/ex/wall_panels_08b_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panels_08b_d.png b/packages/textures/ex/wall_panels_08b_d.png Binary files differnew file mode 100644 index 0000000..bdab756 --- /dev/null +++ b/packages/textures/ex/wall_panels_08b_d.png diff --git a/packages/textures/ex/wall_panels_08b_h.jpg b/packages/textures/ex/wall_panels_08b_h.jpg Binary files differdeleted file mode 100644 index ec90717..0000000 --- a/packages/textures/ex/wall_panels_08b_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panels_08b_h.png b/packages/textures/ex/wall_panels_08b_h.png Binary files differnew file mode 100644 index 0000000..be76a24 --- /dev/null +++ b/packages/textures/ex/wall_panels_08b_h.png diff --git a/packages/textures/ex/wall_panels_08b_s.jpg b/packages/textures/ex/wall_panels_08b_s.jpg Binary files differdeleted file mode 100644 index 0276354..0000000 --- a/packages/textures/ex/wall_panels_08b_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_panels_08b_s.png b/packages/textures/ex/wall_panels_08b_s.png Binary files differnew file mode 100644 index 0000000..79626ac --- /dev/null +++ b/packages/textures/ex/wall_panels_08b_s.png diff --git a/packages/textures/ex/wall_pipe_d.jpg b/packages/textures/ex/wall_pipe_d.jpg Binary files differdeleted file mode 100644 index a59c3b3..0000000 --- a/packages/textures/ex/wall_pipe_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_pipe_d.png b/packages/textures/ex/wall_pipe_d.png Binary files differnew file mode 100644 index 0000000..5dd0209 --- /dev/null +++ b/packages/textures/ex/wall_pipe_d.png diff --git a/packages/textures/ex/wall_pipe_h.jpg b/packages/textures/ex/wall_pipe_h.jpg Binary files differdeleted file mode 100644 index 3990e35..0000000 --- a/packages/textures/ex/wall_pipe_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_pipe_h.png b/packages/textures/ex/wall_pipe_h.png Binary files differnew file mode 100644 index 0000000..f564ae8 --- /dev/null +++ b/packages/textures/ex/wall_pipe_h.png diff --git a/packages/textures/ex/wall_pipe_s.jpg b/packages/textures/ex/wall_pipe_s.jpg Binary files differdeleted file mode 100644 index de326fd..0000000 --- a/packages/textures/ex/wall_pipe_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_pipe_s.png b/packages/textures/ex/wall_pipe_s.png Binary files differnew file mode 100644 index 0000000..2ff960b --- /dev/null +++ b/packages/textures/ex/wall_pipe_s.png diff --git a/packages/textures/ex/wall_u207_d.jpg b/packages/textures/ex/wall_u207_d.jpg Binary files differdeleted file mode 100644 index 8bd5e2c..0000000 --- a/packages/textures/ex/wall_u207_d.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_u207_d.png b/packages/textures/ex/wall_u207_d.png Binary files differnew file mode 100644 index 0000000..21fa2ea --- /dev/null +++ b/packages/textures/ex/wall_u207_d.png diff --git a/packages/textures/ex/wall_u207_h.jpg b/packages/textures/ex/wall_u207_h.jpg Binary files differdeleted file mode 100644 index cb40046..0000000 --- a/packages/textures/ex/wall_u207_h.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_u207_h.png b/packages/textures/ex/wall_u207_h.png Binary files differnew file mode 100644 index 0000000..9dc8806 --- /dev/null +++ b/packages/textures/ex/wall_u207_h.png diff --git a/packages/textures/ex/wall_u207_s.jpg b/packages/textures/ex/wall_u207_s.jpg Binary files differdeleted file mode 100644 index d4cfedb..0000000 --- a/packages/textures/ex/wall_u207_s.jpg +++ /dev/null diff --git a/packages/textures/ex/wall_u207_s.png b/packages/textures/ex/wall_u207_s.png Binary files differnew file mode 100644 index 0000000..07cefe7 --- /dev/null +++ b/packages/textures/ex/wall_u207_s.png diff --git a/packages/textures/floor_lava2.jpg b/packages/textures/floor_lava2.jpg Binary files differdeleted file mode 100644 index 1a23a79..0000000 --- a/packages/textures/floor_lava2.jpg +++ /dev/null diff --git a/packages/textures/floor_lava2.png b/packages/textures/floor_lava2.png Binary files differnew file mode 100644 index 0000000..e3904bb --- /dev/null +++ b/packages/textures/floor_lava2.png diff --git a/packages/textures/water2.jpg b/packages/textures/water2.jpg Binary files differdeleted file mode 100644 index 4c313d7..0000000 --- a/packages/textures/water2.jpg +++ /dev/null diff --git a/packages/textures/water2.png b/packages/textures/water2.png Binary files differnew file mode 100644 index 0000000..872bc81 --- /dev/null +++ b/packages/textures/water2.png diff --git a/packages/textures/water2_n.jpg b/packages/textures/water2_n.jpg Binary files differdeleted file mode 100644 index 4ca3fbd..0000000 --- a/packages/textures/water2_n.jpg +++ /dev/null diff --git a/packages/textures/water2_n.png b/packages/textures/water2_n.png Binary files differnew file mode 100644 index 0000000..94169a9 --- /dev/null +++ b/packages/textures/water2_n.png diff --git a/packages/textures/waterdudv.jpg b/packages/textures/waterdudv.jpg Binary files differdeleted file mode 100644 index 59567fc..0000000 --- a/packages/textures/waterdudv.jpg +++ /dev/null diff --git a/packages/textures/waterdudv.png b/packages/textures/waterdudv.png Binary files differnew file mode 100644 index 0000000..725a2f6 --- /dev/null +++ b/packages/textures/waterdudv.png diff --git a/packages/textures/waterfall.jpg b/packages/textures/waterfall.jpg Binary files differdeleted file mode 100644 index fd5c836..0000000 --- a/packages/textures/waterfall.jpg +++ /dev/null diff --git a/packages/textures/waterfall.png b/packages/textures/waterfall.png Binary files differnew file mode 100644 index 0000000..54de3be --- /dev/null +++ b/packages/textures/waterfall.png diff --git a/packages/textures/waterfalldudv.jpg b/packages/textures/waterfalldudv.jpg Binary files differdeleted file mode 100644 index a9101c2..0000000 --- a/packages/textures/waterfalldudv.jpg +++ /dev/null diff --git a/packages/textures/waterfalldudv.png b/packages/textures/waterfalldudv.png Binary files differnew file mode 100644 index 0000000..ee5f536 --- /dev/null +++ b/packages/textures/waterfalldudv.png diff --git a/packages/textures/waterfalln.jpg b/packages/textures/waterfalln.jpg Binary files differdeleted file mode 100644 index 3c1c50c..0000000 --- a/packages/textures/waterfalln.jpg +++ /dev/null diff --git a/packages/textures/waterfalln.png b/packages/textures/waterfalln.png Binary files differnew file mode 100644 index 0000000..5e23fce --- /dev/null +++ b/packages/textures/waterfalln.png diff --git a/packages/textures/watern.jpg b/packages/textures/watern.jpg Binary files differdeleted file mode 100644 index b39f147..0000000 --- a/packages/textures/watern.jpg +++ /dev/null diff --git a/packages/textures/watern.png b/packages/textures/watern.png Binary files differnew file mode 100644 index 0000000..0a44d9d --- /dev/null +++ b/packages/textures/watern.png diff --git a/src/engine/3dgui.cpp b/src/engine/3dgui.cpp index f1f6ef2..68d5428 100644 --- a/src/engine/3dgui.cpp +++ b/src/engine/3dgui.cpp @@ -15,7 +15,7 @@ static float firstx, firsty; enum {FIELDCOMMIT, FIELDABORT, FIELDEDIT, FIELDSHOW, FIELDKEY}; -static int fieldmode = FIELDSHOW; +static int fieldmode = FIELDSHOW; static bool fieldsactive = false; static bool hascursor; @@ -73,12 +73,12 @@ struct gui : g3d_gui return oldval; } - void autotab() - { + void autotab() + { if(tcurrent) { if(layoutpass && !tpos) tcurrent = NULL; //disable tabs because you didn't start with one - if(shouldautotab && !curdepth && (layoutpass ? 0 : cury) + ysize > guiautotab*FONTH) tab(NULL, tcolor); + if(shouldautotab && !curdepth && (layoutpass ? 0 : cury) + ysize > guiautotab*FONTH) tab(NULL, tcolor); } } @@ -116,20 +116,20 @@ struct gui : g3d_gui bool visible() { return (!tcurrent || tpos==*tcurrent) && !layoutpass; } //tab is always at top of page - void tab(const char *name, int color) + void tab(const char *name, int color) { if(curdepth != 0) return; if(color) tcolor = color; - tpos++; - if(!name) name = intstr(tpos); + tpos++; + if(!name) name = intstr(tpos); int w = max(text_width(name) - 2*INSERT, 0); - if(layoutpass) - { - ty = max(ty, ysize); + if(layoutpass) + { + ty = max(ty, ysize); ysize = 0; } - else - { + else + { cury = -ysize; int h = FONTH-2*INSERT, x1 = curx + tx, @@ -137,20 +137,20 @@ struct gui : g3d_gui y1 = cury - ((skiny[6]-skiny[1])-(skiny[3]-skiny[2]))*SKIN_SCALE-h, y2 = cury; bool hit = tcurrent && windowhit==this && hitx>=x1 && hity>=y1 && hitx<x2 && hity<y2; - if(hit && (!guiclicktab || mousebuttons&G3D_DOWN)) + if(hit && (!guiclicktab || mousebuttons&G3D_DOWN)) *tcurrent = tpos; //roll-over to switch tab - + drawskin(x1-skinx[visible()?2:6]*SKIN_SCALE, y1-skiny[1]*SKIN_SCALE, w, h, visible()?10:19, 9, gui2d ? 1 : 2, light, alpha); text_(name, x1 + (skinx[3]-skinx[2])*SKIN_SCALE - (w ? INSERT : INSERT/2), y1 + (skiny[2]-skiny[1])*SKIN_SCALE - INSERT, tcolor, visible()); } - tx += w + ((skinx[5]-skinx[4]) + (skinx[3]-skinx[2]))*SKIN_SCALE; + tx += w + ((skinx[5]-skinx[4]) + (skinx[3]-skinx[2]))*SKIN_SCALE; } bool ishorizontal() const { return curdepth&1; } bool isvertical() const { return !ishorizontal(); } void pushlist() - { + { if(layoutpass) { if(curlist>=0) @@ -188,7 +188,7 @@ struct gui : g3d_gui ysize = l.h; } } - curdepth++; + curdepth++; } void poplist() @@ -204,7 +204,7 @@ struct gui : g3d_gui curlist = l.parent; curdepth--; if(lists.inrange(curlist)) - { + { int w = xsize, h = ysize; if(ishorizontal()) cury -= h; else curx -= w; list &p = lists[curlist]; @@ -214,7 +214,7 @@ struct gui : g3d_gui { list &s = lists[p.parent]; if(ishorizontal()) xsize = s.w; else ysize = s.h; - } + } layout(w, h); } } @@ -231,8 +231,8 @@ struct gui : g3d_gui //add space between list items void space(float size) { layout(isvertical() ? 0 : int(size*FONTW), isvertical() ? int(size*FONTH) : 0); } - void spring(int weight) - { + void spring(int weight) + { if(curlist < 0) return; list &l = lists[curlist]; if(layoutpass) { if(l.parent >= 0) l.springs += weight; return; } @@ -283,10 +283,10 @@ struct gui : g3d_gui } } - bool mergehits(bool on) - { + bool mergehits(bool on) + { bool oldval = shouldmergehits; - shouldmergehits = on; + shouldmergehits = on; return oldval; } @@ -306,7 +306,7 @@ struct gui : g3d_gui if(visible()) icon_(t, overlaid!=NULL, curx, cury, size, ishit(size+SHADOW, size+SHADOW), overlaid); return layout(size+SHADOW, size+SHADOW); } - + int texture(VSlot &vslot, float scale, bool overlaid) { autotab(); @@ -464,7 +464,7 @@ struct gui : g3d_gui } return layout(size+SHADOW, size+SHADOW); } - + void slider(int &val, int vmin, int vmax, int color, const char *label) { autotab(); @@ -516,7 +516,7 @@ struct gui : g3d_gui } char *field_(const char *name, int color, int length, int height, const char *initval, int initmode, int fieldtype = FIELDEDIT) - { + { editor *e = useeditor(name, initmode, false, initval); // generate a new editor if necessary if(layoutpass) { @@ -528,48 +528,48 @@ struct gui : g3d_gui e->maxx = (e->linewrap) ? -1 : length; e->maxy = (height<=0)?1:-1; e->pixelwidth = abs(length)*FONTW; - if(e->linewrap && e->maxy==1) + if(e->linewrap && e->maxy==1) { int temp; text_bounds(e->lines[0].text, temp, e->pixelheight, e->pixelwidth); //only single line editors can have variable height } - else - e->pixelheight = FONTH*max(height, 1); + else + e->pixelheight = FONTH*max(height, 1); } int h = e->pixelheight; int w = e->pixelwidth + FONTW; - + bool wasvertical = isvertical(); if(wasvertical && e->maxy != 1) pushlist(); - + char *result = NULL; if(visible() && !layoutpass) { e->rendered = true; bool hit = ishit(w, h); - if(hit) + if(hit) { if(mousebuttons&G3D_DOWN) //mouse request focus - { + { if(fieldtype==FIELDKEY) e->clear(); - useeditor(name, initmode, true); + useeditor(name, initmode, true); e->mark(false); fieldmode = fieldtype; - } + } } bool editing = (fieldmode != FIELDSHOW) && (e==currentfocus()); if(hit && editing && (mousebuttons&G3D_PRESSED)!=0 && fieldtype==FIELDEDIT) e->hit(int(floor(hitx-(curx+FONTW/2))), int(floor(hity-cury)), (mousebuttons&G3D_DRAGGED)!=0); //mouse request position - if(editing && ((fieldmode==FIELDCOMMIT) || (fieldmode==FIELDABORT) || !hit)) // commit field if user pressed enter or wandered out of focus + if(editing && ((fieldmode==FIELDCOMMIT) || (fieldmode==FIELDABORT) || !hit)) // commit field if user pressed enter or wandered out of focus { if(fieldmode==FIELDCOMMIT || (fieldmode!=FIELDABORT && !hit)) result = e->currentline().text; e->active = (e->mode!=EDITORFOCUSED); fieldmode = FIELDSHOW; - } + } else fieldsactive = true; - + e->draw(curx+FONTW/2, cury, color, hit && editing); - + hudnotextureshader->set(); glDisable(GL_BLEND); if(editing) gle::colorf(1, 0, 0); @@ -579,19 +579,19 @@ struct gui : g3d_gui hudshader->set(); } layout(w, h); - + if(e->maxy != 1) { int slines = e->limitscrolly(); - if(slines > 0) + if(slines > 0) { int pos = e->scrolly; slider(e->scrolly, slines, 0, color, NULL); - if(pos != e->scrolly) e->cy = e->scrolly; + if(pos != e->scrolly) e->cy = e->scrolly; } if(wasvertical) poplist(); } - + return result; } @@ -620,7 +620,7 @@ struct gui : g3d_gui xtraverts += gle::end(); } - void text_(const char *text, int x, int y, int color, bool shadow, bool force = false) + void text_(const char *text, int x, int y, int color, bool shadow, bool force = false) { if(shadow) draw_text(text, x+SHADOW, y+SHADOW, 0x00, 0x00, 0x00, -0xC0); draw_text(text, x, y, color>>16, (color>>8)&0xFF, color&0xFF, force ? -0xFF : 0xFF); @@ -632,7 +632,7 @@ struct gui : g3d_gui hudnotextureshader->set(); gle::colorub(color>>16, (color>>8)&0xFF, color&0xFF, 0x80); int w = xsize, h = ysize; - if(inheritw>0) + if(inheritw>0) { int parentw = curlist, parentdepth = 0; for(;parentdepth < inheritw && lists[parentw].parent>=0; parentdepth++) @@ -676,7 +676,7 @@ struct gui : g3d_gui rect_(x, y, xs, ys, 0); if(title) text_(title, x + xs/12, y + ys - ys/12 - FONTH, hit ? 0xFF0000 : 0xFFFFFF, hit && actionon, hit); } - } + } void previewslot(VSlot &vslot, bool overlaid, int x, int y, int size, bool hit) { @@ -699,12 +699,12 @@ struct gui : g3d_gui else if(slot.thumbnail && slot.thumbnail != notexture) t = slot.thumbnail; else return; float xt = min(1.0f, t->xs/(float)t->ys), yt = min(1.0f, t->ys/(float)t->xs), xs = size, ys = size; - if(hit && actionon) + if(hit && actionon) { hudnotextureshader->set(); gle::colorf(0, 0, 0, 0.75f); rect_(x+SHADOW, y+SHADOW, xs, ys); - hudshader->set(); + hudshader->set(); } SETSHADER(hudrgb); gle::defvertex(2); @@ -719,7 +719,7 @@ struct gui : g3d_gui if(r.flipx) { xoff *= -1; loopk(4) tc[k].x *= -1; } if(r.flipy) { yoff *= -1; loopk(4) tc[k].y *= -1; } } - loopk(4) { tc[k].x = tc[k].x/xt - xoff/t->xs; tc[k].y = tc[k].y/yt - yoff/t->ys; } + loopk(4) { tc[k].x = tc[k].x/xt - xoff/t->xs; tc[k].y = tc[k].y/yt - yoff/t->ys; } if(slot.loaded) gle::color(vec(color).mul(vslot.colorscale)); else gle::color(color); glBindTexture(GL_TEXTURE_2D, t->id); @@ -754,9 +754,9 @@ struct gui : g3d_gui gle::attribf(x+xs, y+ys); gle::attrib(tc[2]); gle::end(); } - + hudshader->set(); - if(overlaid) + if(overlaid) { if(!overlaytex) overlaytex = textureload("data/guioverlay.png", 3); glBindTexture(GL_TEXTURE_2D, overlaytex->id); @@ -766,29 +766,29 @@ struct gui : g3d_gui } void line_(int size, float percent = 1.0f) - { + { if(visible()) { if(!slidertex) slidertex = textureload("data/guislider.png", 3); glBindTexture(GL_TEXTURE_2D, slidertex->id); - if(percent < 0.99f) + if(percent < 0.99f) { gle::colorf(light.x, light.y, light.z, 0.375f); - if(ishorizontal()) + if(ishorizontal()) rect_(curx + FONTH/2 - size/2, cury, size, ysize, 0); else rect_(curx, cury + FONTH/2 - size/2, xsize, size, 1); } gle::color(light); - if(ishorizontal()) + if(ishorizontal()) rect_(curx + FONTH/2 - size/2, cury + ysize*(1-percent), size, ysize*percent, 0); - else + else rect_(curx, cury + FONTH/2 - size/2, xsize*percent, size, 1); } layout(ishorizontal() ? FONTH : 0, ishorizontal() ? 0 : FONTH); } - void textbox(const char *text, int width, int height, int color) + void textbox(const char *text, int width, int height, int color) { width *= FONTW; height *= FONTH; @@ -806,20 +806,20 @@ struct gui : g3d_gui if(icon) w += ICON_SIZE; if(icon && text) w += padding; if(text) w += text_width(text); - + if(visible()) { bool hit = ishit(w, FONTH); - if(hit && clickable) color = 0xFF0000; - int x = curx; + if(hit && clickable) color = 0xFF0000; + int x = curx; if(isvertical() && center) x += (xsize-w)/2; - + if(icon) { if(icon[0] != ' ') { const char *ext = strrchr(icon, '.'); - defformatstring(tname, "packages/icons/%s%s", icon, ext ? "" : ".jpg"); + defformatstring(tname, "packages/icons/%s%s", icon, ext ? "" : ".png"); icon_(textureload(tname, 3), false, x, cury, ICON_SIZE, clickable && hit); } x += ICON_SIZE; @@ -834,15 +834,15 @@ struct gui : g3d_gui static const int skinx[], skiny[]; static const struct patch { ushort left, right, top, bottom; uchar flags; } patches[]; - static void drawskin(int x, int y, int gapw, int gaph, int start, int n, int passes = 1, const vec &light = vec(1, 1, 1), float alpha = 0.80f)//int vleft, int vright, int vtop, int vbottom, int start, int n) + static void drawskin(int x, int y, int gapw, int gaph, int start, int n, int passes = 1, const vec &light = vec(1, 1, 1), float alpha = 0.80f)//int vleft, int vright, int vtop, int vbottom, int start, int n) { if(!skintex) skintex = textureload("data/guiskin.png", 3); glBindTexture(GL_TEXTURE_2D, skintex->id); int gapx1 = INT_MAX, gapy1 = INT_MAX, gapx2 = INT_MAX, gapy2 = INT_MAX; float wscale = 1.0f/(SKIN_W*SKIN_SCALE), hscale = 1.0f/(SKIN_H*SKIN_SCALE); - + loopj(passes) - { + { bool quads = false; if(passes>1) glDepthFunc(j ? GL_LEQUAL : GL_GREATER); gle::color(j ? light : vec(1, 1, 1), passes<=1 || j ? alpha : alpha/2); //ghost when its behind something in depth @@ -873,13 +873,13 @@ struct gui : g3d_gui top += gaph - (gapy2-gapy1); bottom += gaph - (gapy2-gapy1); } - + //multiple tiled quads if necessary rather than a single stretched one int ystep = bottom-top; int yo = y+top; - while(ystep > 0) + while(ystep > 0) { - if(p.flags&0x10 && yo+ystep-(y+top) > gaph) + if(p.flags&0x10 && yo+ystep-(y+top) > gaph) { ystep = gaph+y+top-yo; tbottom = ttop+ystep*hscale; @@ -887,11 +887,11 @@ struct gui : g3d_gui int xstep = right-left; int xo = x+left; float tright2 = tright; - while(xstep > 0) + while(xstep > 0) { - if(p.flags&0x01 && xo+xstep-(x+left) > gapw) + if(p.flags&0x01 && xo+xstep-(x+left) > gapw) { - xstep = gapw+x+left-xo; + xstep = gapw+x+left-xo; tright = tleft+xstep*wscale; } if(!quads) @@ -917,7 +917,7 @@ struct gui : g3d_gui else break; //if it didn't happen on the first pass, it won't happen on the second.. } if(passes>1) glDepthFunc(GL_ALWAYS); - } + } vec origin, scale, *savedorigin; float dist; @@ -943,10 +943,10 @@ struct gui : g3d_gui } void start(int starttime, float initscale, int *tab, bool allowinput) - { - if(gui2d) + { + if(gui2d) { - initscale *= 0.025f; + initscale *= 0.025f; if(allowinput) hascursor = true; } basescale = initscale; @@ -961,7 +961,7 @@ struct gui : g3d_gui tcurrent = tab; tcolor = 0xFFFFFF; pushlist(); - if(layoutpass) + if(layoutpass) { firstlist = nextlist = curlist; memset(columns, 0, sizeof(columns)); @@ -969,13 +969,13 @@ struct gui : g3d_gui else { if(tcurrent && !*tcurrent) tcurrent = NULL; - cury = -ysize; + cury = -ysize; curx = -xsize/2; - + if(gui2d) { hudmatrix.ortho(0, 1, 1, 0, -1, 1); - hudmatrix.translate(origin); + hudmatrix.translate(origin); hudmatrix.scale(scale); light = vec(1, 1, 1); @@ -988,9 +988,9 @@ struct gui : g3d_gui hudmatrix.rotate_around_z(yaw - 90*RAD); hudmatrix.rotate_around_x(-90*RAD); hudmatrix.scale(-scale.x, scale.y, scale.z); - + vec dir; - lightreaching(origin, light, dir, false, 0, 0.5f); + lightreaching(origin, light, dir, false, 0, 0.5f); float intensity = vec(yaw, 0.0f).dot(dir); light.mul(1.0f + max(intensity, 0.0f)); } @@ -1028,7 +1028,7 @@ struct gui : g3d_gui } xsize = max(xsize, w); } - + void adjustcolumns() { if(lists.inrange(curlist)) @@ -1051,7 +1051,7 @@ struct gui : g3d_gui } if(l.column >= 0) { - if(depth&1) adjusthorizontalcolumn(l.column, i); + if(depth&1) adjusthorizontalcolumn(l.column, i); else adjustverticalcolumn(l.column, i); } } @@ -1060,7 +1060,7 @@ struct gui : g3d_gui void end() { if(layoutpass) - { + { adjustcolumns(); xsize = max(tx, xsize); ysize = max(ty, ysize); @@ -1114,8 +1114,8 @@ Texture *gui::skintex = NULL, *gui::overlaytex = NULL, *gui::slidertex = NULL; const int gui::skiny[] = {0, 7, 21, 34, 43, 48, 56, 104, 111, 117, 128}, gui::skinx[] = {0, 11, 23, 37, 105, 119, 137, 151, 215, 229, 246, 256}; //Note: skinx[3]-skinx[2] = skinx[7]-skinx[6] -// skinx[5]-skinx[4] = skinx[9]-skinx[8] -const gui::patch gui::patches[] = +// skinx[5]-skinx[4] = skinx[9]-skinx[8] +const gui::patch gui::patches[] = { //arguably this data can be compressed - it depends on what else needs to be skinned in the future {1,2,3,6, 0}, // body {2,9,5,6, 0x01}, @@ -1166,7 +1166,7 @@ bool g3d_input(const char *str, int len) { editor *e = currentfocus(); if(fieldmode == FIELDKEY || fieldmode == FIELDSHOW || !e) return false; - + e->input(str, len); return true; } @@ -1198,10 +1198,10 @@ bool g3d_key(int code, bool isdown) { if(windowhit) switch(code) { - case -4: // window "management" + case -4: // window "management" if(isdown) { - if(windowhit->gui2d) + if(windowhit->gui2d) { vec origin = *guis2d.last().savedorigin; int i = windowhit - &guis2d[0]; @@ -1300,7 +1300,7 @@ static inline bool g3d_sort(const gui &a, const gui &b) { return a.dist < b.dist bool g3d_windowhit(bool on, bool act) { extern int cleargui(int n); - if(act) + if(act) { if(actionon || windowhit) { @@ -1311,25 +1311,25 @@ bool g3d_windowhit(bool on, bool act) return (guis2d.length() && hascursor) || (windowhit && !windowhit->gui2d); } -void g3d_render() +void g3d_render() { - windowhit = NULL; + windowhit = NULL; if(actionon) mousebuttons |= G3D_PRESSED; - - gui::reset(); + + gui::reset(); guis2d.shrink(0); guis3d.shrink(0); - + // call all places in the engine that may want to render a gui from here, they call g3d_addgui() extern void g3d_texturemenu(); - + if(!mainmenu) g3d_texturemenu(); g3d_mainmenu(); if(!mainmenu) game::g3d_gamemenus(); guis2d.sort(g3d_sort); guis3d.sort(g3d_sort); - + readyeditors(); fieldsactive = false; diff --git a/src/engine/lightning.h b/src/engine/lightning.h index bc6e21c..16b146d 100644 --- a/src/engine/lightning.h +++ b/src/engine/lightning.h @@ -42,10 +42,10 @@ static void renderlightning(Texture *tex, const vec &o, const vec &d, float sz) up.normalize(); right.cross(up, step); right.normalize(); - float scroll = -float(lastmillis%lnscrollmillis)/lnscrollmillis, + float scroll = -float(lastmillis%lnscrollmillis)/lnscrollmillis, scrollscale = lnscrollscale*(LIGHTNINGSTEP*tex->ys)/(sz*tex->xs), blend = pow(clamp(float(lastmillis - lastlnjitter)/lnjittermillis, 0.0f, 1.0f), lnblendpower), - jitter0 = (1-blend)*lnjitterscale*sz/lnjitterradius, jitter1 = blend*lnjitterscale*sz/lnjitterradius; + jitter0 = (1-blend)*lnjitterscale*sz/lnjitterradius, jitter1 = blend*lnjitterscale*sz/lnjitterradius; gle::begin(GL_TRIANGLE_STRIP); loopj(numsteps) { @@ -82,7 +82,7 @@ static void renderlightning(Texture *tex, const vec &o, const vec &d, float sz) struct lightningrenderer : listrenderer { lightningrenderer() - : listrenderer("packages/particles/lightning.jpg", 2, PT_LIGHTNING|PT_TRACK|PT_GLARE) + : listrenderer("packages/particles/lightning.png", 2, PT_LIGHTNING|PT_TRACK|PT_GLARE) {} void startrender() diff --git a/src/engine/renderparticles.cpp b/src/engine/renderparticles.cpp index 17350cf..93034a2 100644 --- a/src/engine/renderparticles.cpp +++ b/src/engine/renderparticles.cpp @@ -6,7 +6,7 @@ Shader *particleshader = NULL, *particlenotextureshader = NULL; VARP(particlesize, 20, 100, 500); - + // Check canemitparticles() to limit the rate that paricles can be emitted for models/sparklies // Automatically stops particles being emitted when paused or in reflective drawing VARP(emitmillis, 1, 17, 1000); @@ -47,7 +47,7 @@ struct particleemitter cullmax = ivec(int(ceil(bbmax.x)), int(ceil(bbmax.y)), int(ceil(bbmax.z))); if(dbgpseed) conoutf(CON_DEBUG, "radius: %f, maxfade: %d", radius, maxfade); } - + void extendbb(const vec &o, float size = 0) { bbmin.x = min(bbmin.x, o.x - size); @@ -136,7 +136,7 @@ struct particle uchar color2[3]; uchar progress; }; - }; + }; }; struct partvert @@ -157,7 +157,7 @@ struct partrenderer uint type; int collide; string info; - + partrenderer(const char *texname, int texclamp, int type, int collide = 0) : tex(NULL), texname(texname), texclamp(texclamp), type(type), collide(collide) { @@ -172,8 +172,8 @@ struct partrenderer virtual void init(int n) { } virtual void reset() = 0; - virtual void resettracked(physent *owner) { } - virtual particle *addpart(const vec &o, const vec &d, int fade, int color, float size, int gravity = 0) = 0; + virtual void resettracked(physent *owner) { } + virtual particle *addpart(const vec &o, const vec &d, int fade, int color, float size, int gravity = 0) = 0; virtual int adddepthfx(vec &bbmin, vec &bbmax) { return 0; } virtual void update() { } virtual void render() = 0; @@ -191,7 +191,7 @@ struct partrenderer o = p->o; d = p->d; if(type&PT_TRACK && p->owner) game::particletrack(p->owner, o, d); - if(p->fade <= 5) + if(p->fade <= 5) { ts = 1; blend = 255; @@ -214,9 +214,9 @@ struct partrenderer vec surface; float floorz = rayfloor(vec(o.x, o.y, p->val), surface, RAY_CLIPMAT, COLLIDERADIUS); float collidez = floorz<0 ? o.z-COLLIDERADIUS : p->val - floorz; - if(o.z >= collidez+COLLIDEERROR) + if(o.z >= collidez+COLLIDEERROR) p->val = collidez+COLLIDEERROR; - else + else { adddecal(collide, vec(o.x, o.y, collidez), vec(p->o).sub(o).normalize(), 2*p->size, p->color, type&PT_RND4 ? (p->flags>>5)&3 : 0); blend = 0; @@ -240,7 +240,7 @@ struct partrenderer int len = strlen(info); info[len-1] = info[len-1] == ',' ? ')' : '\0'; if(texname) - { + { const char *title = strrchr(texname, '/'); if(title) concformatstring(info, ": %s", title+1); } @@ -249,7 +249,7 @@ struct partrenderer }; struct listparticle : particle -{ +{ listparticle *next; }; @@ -260,7 +260,7 @@ struct listrenderer : partrenderer static listparticle *parempty; listparticle *list; - listrenderer(const char *texname, int texclamp, int type, int collide = 0) + listrenderer(const char *texname, int texclamp, int type, int collide = 0) : partrenderer(texname, texclamp, type, collide), list(NULL) { } @@ -277,7 +277,7 @@ struct listrenderer : partrenderer { } - void reset() + void reset() { if(!list) return; listparticle *p = list; @@ -291,13 +291,13 @@ struct listrenderer : partrenderer parempty = list; list = NULL; } - - void resettracked(physent *owner) + + void resettracked(physent *owner) { if(!(type&PT_TRACK)) return; for(listparticle **prev = &list, *cur = list; cur; cur = *prev) { - if(!owner || cur->owner==owner) + if(!owner || cur->owner==owner) { *prev = cur->next; cur->next = parempty; @@ -306,8 +306,8 @@ struct listrenderer : partrenderer else prev = &cur->next; } } - - particle *addpart(const vec &o, const vec &d, int fade, int color, float size, int gravity) + + particle *addpart(const vec &o, const vec &d, int fade, int color, float size, int gravity) { if(!parempty) { @@ -331,25 +331,25 @@ struct listrenderer : partrenderer p->flags = 0; return p; } - - int count() + + int count() { int num = 0; listparticle *lp; for(lp = list; lp; lp = lp->next) num++; return num; } - - bool haswork() + + bool haswork() { return (list != NULL); } - + virtual void startrender() = 0; virtual void endrender() = 0; virtual void renderpart(listparticle *p, const vec &o, const vec &d, int blend, int ts) = 0; - void render() + void render() { startrender(); if(texname) @@ -357,17 +357,17 @@ struct listrenderer : partrenderer if(!tex) tex = textureload(texname, texclamp); glBindTexture(GL_TEXTURE_2D, tex->id); } - + for(listparticle **prev = &list, *p = list; p; p = *prev) - { + { vec o, d; int blend, ts; calc(p, blend, ts, o, d, canstep); - if(blend > 0) + if(blend > 0) { renderpart(p, o, d, blend, ts); - if(p->fade > 5 || !canstep) + if(p->fade > 5 || !canstep) { prev = &p->next; continue; @@ -379,7 +379,7 @@ struct listrenderer : partrenderer killpart(p); parempty = p; } - + endrender(); } }; @@ -494,7 +494,7 @@ struct textrenderer : listrenderer textmatrix = &m; draw_text(p->text, 0, 0, p->color.r, p->color.g, p->color.b, blend); textmatrix = NULL; - } + } }; static textrenderer texts(PT_TEXT|PT_LERP); @@ -645,7 +645,7 @@ inline void seedpos<PT_TRAIL>(particleemitter &pe, const vec &o, const vec &d, i vec e = d; if(grav) e.z -= float(fade)/grav; e.div(-75.0f).add(o); - pe.extendbb(e, size); + pe.extendbb(e, size); } template<int T> @@ -656,7 +656,7 @@ struct varenderer : partrenderer int maxparts, numparts, lastupdate, rndmask; GLuint vbo; - varenderer(const char *texname, int type, int collide = 0) + varenderer(const char *texname, int type, int collide = 0) : partrenderer(texname, 3, type, collide), verts(NULL), parts(NULL), maxparts(0), numparts(0), lastupdate(-1), rndmask(0), vbo(0) { @@ -670,7 +670,7 @@ struct varenderer : partrenderer { if(vbo) { glDeleteBuffers_(1, &vbo); vbo = 0; } } - + void init(int n) { DELETEA(parts); @@ -681,14 +681,14 @@ struct varenderer : partrenderer numparts = 0; lastupdate = -1; } - - void reset() + + void reset() { numparts = 0; lastupdate = -1; } - - void resettracked(physent *owner) + + void resettracked(physent *owner) { if(!(type&PT_TRACK)) return; loopi(numparts) @@ -698,18 +698,18 @@ struct varenderer : partrenderer } lastupdate = -1; } - - int count() + + int count() { return numparts; } - - bool haswork() + + bool haswork() { return (numparts > 0); } - particle *addpart(const vec &o, const vec &d, int fade, int color, float size, int gravity) + particle *addpart(const vec &o, const vec &d, int fade, int color, float size, int gravity) { particle *p = parts + (numparts < maxparts ? numparts++ : rnd(maxparts)); //next free slot, or kill a random kitten p->o = o; @@ -724,7 +724,7 @@ struct varenderer : partrenderer lastupdate = -1; return p; } - + void seedemitter(particleemitter &pe, const vec &o, const vec &d, int fade, float size, int gravity) { pe.maxfade = max(pe.maxfade, fade); @@ -743,7 +743,7 @@ struct varenderer : partrenderer float tpeak = d.z*gravity; if(tpeak > 0 && tpeak < fade) pe.extendbb(o.z + 1.5f*d.z*tpeak/5000.0f, size); } - + void genverts(particle *p, partvert *vs, bool regen) { vec o, d; @@ -775,7 +775,7 @@ struct varenderer : partrenderer if(p->flags&0x01) swap(u1, u2); if(p->flags&0x02) swap(v1, v2); }); - } + } else if(type&PT_ICON) { float tx = 0.25f*(p->flags&3), ty = 0.25f*((p->flags>>2)&3); @@ -807,9 +807,9 @@ struct varenderer : partrenderer partvert *vs = &verts[i*4]; if(p->fade < 0) { - do + do { - --numparts; + --numparts; if(numparts <= i) return; } while(parts[numparts].fade < 0); @@ -819,7 +819,7 @@ struct varenderer : partrenderer else genverts(p, vs, (p->flags&0x80)!=0); } } - + void update() { if(lastmillis == lastupdate && vbo) return; @@ -833,9 +833,9 @@ struct varenderer : partrenderer glBufferSubData_(GL_ARRAY_BUFFER, 0, numparts*4*sizeof(partvert), verts); gle::clearvbo(); } - + void render() - { + { if(!tex) tex = textureload(texname, texclamp); glBindTexture(GL_TEXTURE_2D, tex->id); @@ -885,7 +885,7 @@ struct softquadrenderer : quadrenderer vec o, d; int blend, ts; calc(&p, blend, ts, o, d, false); - if(!isfoggedsphere(radius, p.o) && (depthfxscissor!=2 || depthfxtex.addscissorbox(p.o, radius))) + if(!isfoggedsphere(radius, p.o) && (depthfxscissor!=2 || depthfxtex.addscissorbox(p.o, radius))) { numsoft++; loopk(3) @@ -899,9 +899,9 @@ struct softquadrenderer : quadrenderer } }; -static partrenderer *parts[] = +static partrenderer *parts[] = { - new quadrenderer("<grey>packages/particles/blood.png", PT_PART|PT_FLIP|PT_MOD|PT_RND4, DECAL_BLOOD), // blood spats (note: rgb is inverted) + new quadrenderer("<grey>packages/particles/blood.png", PT_PART|PT_FLIP|PT_MOD|PT_RND4, DECAL_BLOOD), // blood spats (note: rgb is inverted) new trailrenderer("packages/particles/base.png", PT_TRAIL|PT_LERP), // water, entity new quadrenderer("<grey>packages/particles/smoke.png", PT_PART|PT_FLIP|PT_LERP), // smoke new quadrenderer("<grey>packages/particles/steam.png", PT_PART|PT_FLIP), // steam @@ -909,16 +909,16 @@ static partrenderer *parts[] = new quadrenderer("packages/particles/ball1.png", PT_PART|PT_FEW|PT_GLARE), // fireball1 new quadrenderer("packages/particles/ball2.png", PT_PART|PT_FEW|PT_GLARE), // fireball2 new quadrenderer("packages/particles/ball3.png", PT_PART|PT_FEW|PT_GLARE), // fireball3 - new taperenderer("packages/particles/flare.jpg", PT_TAPE|PT_GLARE), // streak + new taperenderer("packages/particles/flare.png", PT_TAPE|PT_GLARE), // streak &lightnings, // lightning &fireballs, // explosion fireball &bluefireballs, // bluish explosion fireball new quadrenderer("packages/particles/spark.png", PT_PART|PT_FLIP|PT_GLARE), // sparks new quadrenderer("packages/particles/base.png", PT_PART|PT_FLIP|PT_GLARE), // edit mode entities new quadrenderer("<grey>packages/particles/snow.png", PT_PART|PT_FLIP|PT_RND4, -1), // colliding snow - new quadrenderer("packages/particles/muzzleflash1.jpg", PT_PART|PT_FEW|PT_FLIP|PT_GLARE|PT_TRACK), // muzzle flash - new quadrenderer("packages/particles/muzzleflash2.jpg", PT_PART|PT_FEW|PT_FLIP|PT_GLARE|PT_TRACK), // muzzle flash - new quadrenderer("packages/particles/muzzleflash3.jpg", PT_PART|PT_FEW|PT_FLIP|PT_GLARE|PT_TRACK), // muzzle flash + new quadrenderer("packages/particles/muzzleflash1.png", PT_PART|PT_FEW|PT_FLIP|PT_GLARE|PT_TRACK), // muzzle flash + new quadrenderer("packages/particles/muzzleflash2.png", PT_PART|PT_FEW|PT_FLIP|PT_GLARE|PT_TRACK), // muzzle flash + new quadrenderer("packages/particles/muzzleflash3.png", PT_PART|PT_FEW|PT_FLIP|PT_GLARE|PT_TRACK), // muzzle flash new quadrenderer("packages/hud/items.png", PT_PART|PT_FEW|PT_ICON), // hud icon new quadrenderer("<colorify:1/1/1>packages/hud/items.png", PT_PART|PT_FEW|PT_ICON), // grey hud icon &texts, // text @@ -954,14 +954,14 @@ void finddepthfxranges() } } } - } + } if(depthfxscissor<2 && numdepthfxranges>0) depthfxtex.addscissorbox(depthfxmin, depthfxmax); } - + VARFP(maxparticles, 10, 4000, 40000, initparticles()); VARFP(fewparticles, 10, 100, 40000, initparticles()); -void initparticles() +void initparticles() { if(!particleshader) particleshader = lookupshaderbyname("particle"); if(!particlenotextureshader) particlenotextureshader = lookupshaderbyname("particlenotexture"); @@ -969,10 +969,10 @@ void initparticles() } void clearparticles() -{ +{ loopi(sizeof(parts)/sizeof(parts[0])) parts[i]->reset(); clearparticleemitters(); -} +} void cleanupparticles() { @@ -993,7 +993,7 @@ void debugparticles() if(!dbgparts) return; int n = sizeof(parts)/sizeof(parts[0]); pushhudmatrix(); - hudmatrix.ortho(0, FONTH*n*2*screenw/float(screenh), FONTH*n*2, 0, -1, 1); //squeeze into top-left corner + hudmatrix.ortho(0, FONTH*n*2*screenw/float(screenh), FONTH*n*2, 0, -1, 1); //squeeze into top-left corner flushhudmatrix(); hudshader->set(); loopi(n) draw_text(parts[i]->info, FONTH, (i+n/2)*FONTH); @@ -1007,17 +1007,17 @@ void renderparticles(bool mainpass) if(dbgparts && mainpass) loopi(sizeof(parts)/sizeof(parts[0])) parts[i]->debuginfo(); if(glaring && !particleglare) return; - - loopi(sizeof(parts)/sizeof(parts[0])) + + loopi(sizeof(parts)/sizeof(parts[0])) { if(glaring && !(parts[i]->type&PT_GLARE)) continue; parts[i]->update(); } - + bool rendered = false; uint lastflags = PT_LERP|PT_SHADER, flagmask = PT_LERP|PT_MOD|PT_SHADER|PT_NOTEX; - + if(binddepthfxtex()) flagmask |= PT_SOFT; loopi(sizeof(parts)/sizeof(parts[0])) @@ -1025,18 +1025,18 @@ void renderparticles(bool mainpass) partrenderer *p = parts[i]; if(glaring && !(p->type&PT_GLARE)) continue; if(!p->haswork()) continue; - + if(!rendered) { rendered = true; glDepthMask(GL_FALSE); glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); if(glaring) GLOBALPARAMF(colorscale, particleglare, particleglare, particleglare, 1); else GLOBALPARAMF(colorscale, 1, 1, 1, 1); } - + uint flags = p->type & flagmask, changedbits = (flags ^ lastflags); if(changedbits) { @@ -1066,7 +1066,7 @@ void renderparticles(bool mainpass) else particleshader->set(); } } - lastflags = flags; + lastflags = flags; } p->render(); } @@ -1085,7 +1085,7 @@ static int addedparticles = 0; static inline particle *newparticle(const vec &o, const vec &d, int fade, int type, int color, float size, int gravity = 0) { static particle dummy; - if(seedemitter) + if(seedemitter) { parts[type]->seedemitter(*seedemitter, o, d, fade, size, gravity); return &dummy; @@ -1100,7 +1100,7 @@ VARP(maxparticledistance, 256, 1024, 4096); static void splash(int type, int color, int radius, int num, int fade, const vec &p, float size, int gravity) { if(camera1->o.dist(p) > maxparticledistance && !seedemitter) return; - float collidez = parts[type]->collide ? p.z - raycube(p, vec(0, 0, -1), COLLIDERADIUS, RAY_CLIPMAT) + (parts[type]->collide >= 0 ? COLLIDEERROR : 0) : -1; + float collidez = parts[type]->collide ? p.z - raycube(p, vec(0, 0, -1), COLLIDERADIUS, RAY_CLIPMAT) + (parts[type]->collide >= 0 ? COLLIDEERROR : 0) : -1; int fmin = 1; int fmax = fade*3; loopi(num) @@ -1119,7 +1119,7 @@ static void splash(int type, int color, int radius, int num, int fade, const vec } } -static void regularsplash(int type, int color, int radius, int num, int fade, const vec &p, float size, int gravity, int delay = 0) +static void regularsplash(int type, int color, int radius, int num, int fade, const vec &p, float size, int gravity, int delay = 0) { if(!canemitparticles() || (delay > 0 && rnd(delay) != 0)) return; splash(type, color, radius, num, fade, p, size, gravity); @@ -1130,13 +1130,13 @@ bool canaddparticles() return !renderedgame && !shadowmapping && !minimized; } -void regular_particle_splash(int type, int num, int fade, const vec &p, int color, float size, int radius, int gravity, int delay) +void regular_particle_splash(int type, int num, int fade, const vec &p, int color, float size, int radius, int gravity, int delay) { if(!canaddparticles()) return; regularsplash(type, color, radius, num, fade, p, size, gravity, delay); } -void particle_splash(int type, int num, int fade, const vec &p, int color, float size, int radius, int gravity) +void particle_splash(int type, int num, int fade, const vec &p, int color, float size, int radius, int gravity) { if(!canaddparticles()) return; splash(type, color, radius, num, fade, p, size, gravity); @@ -1222,15 +1222,15 @@ void particle_fireball(const vec &dest, float maxsize, int type, int fade, int c } //dir = 0..6 where 0=up -static inline vec offsetvec(vec o, int dir, int dist) +static inline vec offsetvec(vec o, int dir, int dist) { - vec v = vec(o); + vec v = vec(o); v[(2+dir)%3] += (dir>2)?(-dist):dist; return v; } //converts a 16bit color to 24bit -static inline int colorfromattr(int attr) +static inline int colorfromattr(int attr) { return (((attr&0xF)<<4) | ((attr&0xF0)<<8) | ((attr&0xF00)<<12)) + 0x0F0F0F; } @@ -1249,7 +1249,7 @@ static inline int colorfromattr(int attr) void regularshape(int type, int radius, int color, int dir, int num, int fade, const vec &p, float size, int gravity, int vel = 200) { if(!canemitparticles()) return; - + int basetype = parts[type]->type&0xFF; bool flare = (basetype == PT_TAPE) || (basetype == PT_LIGHTNING), inv = (dir&0x20)!=0, taper = (dir&0x40)!=0 && !seedemitter; @@ -1257,8 +1257,8 @@ void regularshape(int type, int radius, int color, int dir, int num, int fade, c loopi(num) { vec to, from; - if(dir < 12) - { + if(dir < 12) + { const vec2 &sc = sincos360[rnd(360)]; to[dir%3] = sc.y*radius; to[(dir+1)%3] = sc.x*radius; @@ -1279,7 +1279,7 @@ void regularshape(int type, int radius, int color, int dir, int num, int fade, c } } else if(dir < 15) //plane - { + { to[dir%3] = float(rnd(radius<<4)-(radius<<3))/8.0; to[(dir+1)%3] = float(rnd(radius<<4)-(radius<<3))/8.0; to[(dir+2)%3] = radius; @@ -1289,12 +1289,12 @@ void regularshape(int type, int radius, int color, int dir, int num, int fade, c } else if(dir < 21) //line { - if(dir < 18) + if(dir < 18) { to[dir%3] = float(rnd(radius<<4)-(radius<<3))/8.0; to[(dir+1)%3] = 0.0; - } - else + } + else { to[dir%3] = 0.0; to[(dir+1)%3] = float(rnd(radius<<4)-(radius<<3))/8.0; @@ -1302,11 +1302,11 @@ void regularshape(int type, int radius, int color, int dir, int num, int fade, c to[(dir+2)%3] = 0.0; to.add(p); from = to; - to[(dir+2)%3] += radius; - } + to[(dir+2)%3] += radius; + } else if(dir < 24) //sphere - { - to = vec(2*M_PI*float(rnd(1000))/1000.0, M_PI*float(rnd(1000)-500)/1000.0).mul(radius); + { + to = vec(2*M_PI*float(rnd(1000))/1000.0, M_PI*float(rnd(1000)-500)/1000.0).mul(radius); to.add(p); from = p; } @@ -1316,9 +1316,9 @@ void regularshape(int type, int radius, int color, int dir, int num, int fade, c to[(dir+1)%3] = float(rndscale(2*radius)-radius); to[(dir+2)%3] = 0.0; to.add(p); - from = to; + from = to; } - else from = to = p; + else from = to = p; if(inv) swap(from, to); @@ -1331,11 +1331,11 @@ void regularshape(int type, int radius, int color, int dir, int num, int fade, c if(rnd(0x10000) > dist*dist*0xFFFF) continue; } } - + if(flare) newparticle(from, to, rnd(fade*3)+1, type, color, size, gravity); - else - { + else + { vec d = vec(to).sub(from).rescale(vel); //velocity particle *n = newparticle(from, d, rnd(fade*3)+1, type, color, size, gravity); if(parts[type]->collide) @@ -1344,15 +1344,15 @@ void regularshape(int type, int radius, int color, int dir, int num, int fade, c } } -static void regularflame(int type, const vec &p, float radius, float height, int color, int density = 3, float scale = 2.0f, float speed = 200.0f, float fade = 600.0f, int gravity = -15) +static void regularflame(int type, const vec &p, float radius, float height, int color, int density = 3, float scale = 2.0f, float speed = 200.0f, float fade = 600.0f, int gravity = -15) { if(!canemitparticles()) return; - + float size = scale * min(radius, height); vec v(0, 0, min(1.0f, height)*speed); loopi(density) { - vec s = p; + vec s = p; s.x += rndscale(radius*2.0f)-radius; s.y += rndscale(radius*2.0f)-radius; newparticle(s, v, rnd(max(int(fade*height), 1))+1, type, color, size, gravity); @@ -1365,7 +1365,7 @@ void regular_particle_flame(int type, const vec &p, float radius, float height, regularflame(type, p, radius, height, color, density, scale, speed, fade, gravity); } -static void makeparticles(entity &e) +static void makeparticles(entity &e) { switch(e.attr1) { @@ -1388,10 +1388,10 @@ static void makeparticles(entity &e) if(e.attr3 > 0) color = colorfromattr(e.attr3); else { - int mat = MAT_WATER + clamp(-e.attr3, 0, 3); + int mat = MAT_WATER + clamp(-e.attr3, 0, 3); const bvec &wfcol = getwaterfallcolor(mat); color = (int(wfcol[0])<<16) | (int(wfcol[1])<<8) | int(wfcol[2]); - if(!color) + if(!color) { const bvec &wcol = getwatercolor(mat); color = (int(wcol[0])<<16) | (int(wcol[1])<<8) | int(wcol[2]); @@ -1404,7 +1404,7 @@ static void makeparticles(entity &e) newparticle(e.o, vec(0, 0, 1), 1, PART_EXPLOSION, colorfromattr(e.attr3), 4.0f)->val = 1+e.attr2; break; case 4: //tape - <dir> <length> <rgb> - case 7: //lightning + case 7: //lightning case 9: //steam case 10: //water case 13: //snow @@ -1456,7 +1456,7 @@ bool printparticles(extentity &e, char *buf, int len) { switch(e.attr1) { - case 0: case 4: case 7: case 8: case 9: case 10: case 11: case 12: case 13: + case 0: case 4: case 7: case 8: case 9: case 10: case 11: case 12: case 13: nformatstring(buf, len, "%s %d %d %d 0x%.3hX %d", entities::entname(e.type), e.attr1, e.attr2, e.attr3, e.attr4, e.attr5); return true; case 3: @@ -1464,7 +1464,7 @@ bool printparticles(extentity &e, char *buf, int len) return true; case 5: case 6: nformatstring(buf, len, "%s %d %d 0x%.3hX 0x%.3hX %d", entities::entname(e.type), e.attr1, e.attr2, e.attr3, e.attr4, e.attr5); - return true; + return true; } return false; } @@ -1480,7 +1480,7 @@ void seedparticles() extentity &e = *pe.ent; seedemitter = &pe; for(int millis = 0; millis < seedmillis; millis += min(emitmillis, seedmillis/10)) - makeparticles(e); + makeparticles(e); seedemitter = NULL; pe.lastemit = -seedmillis; pe.finalize(); @@ -1499,10 +1499,10 @@ void updateparticles() lastemitframe = lastmillis - (lastmillis%emitmillis); } else canemit = false; - + flares.makelightflares(); - if(!editmode || showparticles) + if(!editmode || showparticles) { int emitted = 0, replayed = 0; addedparticles = 0; @@ -1510,7 +1510,7 @@ void updateparticles() { particleemitter &pe = emitters[i]; extentity &e = *pe.ent; - if(e.o.dist(camera1->o) > maxparticledistance) { pe.lastemit = lastmillis; continue; } + if(e.o.dist(camera1->o) > maxparticledistance) { pe.lastemit = lastmillis; continue; } if(cullparticles && pe.maxfade >= 0) { if(isfoggedsphere(pe.radius, pe.center)) { pe.lastcull = lastmillis; continue; } @@ -1526,7 +1526,7 @@ void updateparticles() replayed++; } emitoffset = 0; - } + } pe.lastemit = lastmillis; } if(dbgpcull && (canemit || replayed) && addedparticles) conoutf(CON_DEBUG, "%d emitters, %d particles", emitted, addedparticles); diff --git a/src/engine/worldio.cpp b/src/engine/worldio.cpp index 514b45e..393bfa5 100644 --- a/src/engine/worldio.cpp +++ b/src/engine/worldio.cpp @@ -34,10 +34,10 @@ void getmapfilenames(const char *fname, const char *cname, char *pakname, char * } else { - copystring(pakname, "base", MAXSTRLEN); + copystring(pakname, "maps", MAXSTRLEN); copystring(cfgname, name, MAXSTRLEN); } - validmapname(mapname, fname, strpbrk(fname, "/\\") ? NULL : "base/"); + validmapname(mapname, fname, strpbrk(fname, "/\\") ? NULL : "maps/"); } static void fixent(entity &e, int version) @@ -163,7 +163,7 @@ bool loadents(const char *fname, vector<entity> &ents, uint *crc) f->seek(0, SEEK_END); *crc = f->getcrc(); } - + delete f; return true; @@ -183,7 +183,7 @@ void setmapfilenames(const char *fname, const char *cname = NULL) if(savebak==1) formatstring(bakname, "packages/%s.BAK", mapname); else formatstring(bakname, "packages/%s_%d.BAK", mapname, totalmillis); formatstring(cfgname, "packages/%s/%s.cfg", pakname, mcfgname); - formatstring(picname, "packages/%s.jpg", mapname); + formatstring(picname, "packages/%s.png", mapname); path(ogzname); path(bakname); @@ -204,7 +204,7 @@ void mapcfgname() COMMAND(mapcfgname, ""); void backup(char *name, char *backupname) -{ +{ string backupfile; copystring(backupfile, findfile(backupname, "wb")); remove(backupfile); @@ -237,13 +237,13 @@ void savec(cube *c, const ivec &o, int size, stream *f, bool nolms) if(!nolms) { if(c[i].merged) oflags |= 0x80; - if(c[i].ext) loopj(6) + if(c[i].ext) loopj(6) { const surfaceinfo &surf = c[i].ext->surfaces[j]; if(!surf.used()) continue; - oflags |= 0x20; - surfmask |= 1<<j; - totalverts += surf.totalverts(); + oflags |= 0x20; + surfmask |= 1<<j; + totalverts += surf.totalverts(); } } @@ -254,12 +254,12 @@ void savec(cube *c, const ivec &o, int size, stream *f, bool nolms) f->write(c[i].edges, 12); } } - + loopj(6) f->putlil<ushort>(c[i].texture[j]); if(oflags&0x40) f->putlil<ushort>(c[i].material); if(oflags&0x80) f->putchar(c[i].merged); - if(oflags&0x20) + if(oflags&0x20) { f->putchar(surfmask); f->putchar(totalverts); @@ -267,18 +267,18 @@ void savec(cube *c, const ivec &o, int size, stream *f, bool nolms) { surfaceinfo surf = c[i].ext->surfaces[j]; vertinfo *verts = c[i].ext->verts() + surf.verts; - int layerverts = surf.numverts&MAXFACEVERTS, numverts = surf.totalverts(), + int layerverts = surf.numverts&MAXFACEVERTS, numverts = surf.totalverts(), vertmask = 0, vertorder = 0, uvorder = 0, dim = dimension(j), vc = C[dim], vr = R[dim]; if(numverts) { - if(c[i].merged&(1<<j)) + if(c[i].merged&(1<<j)) { vertmask |= 0x04; if(layerverts == 4) { ivec v[4] = { verts[0].getxyz(), verts[1].getxyz(), verts[2].getxyz(), verts[3].getxyz() }; - loopk(4) + loopk(4) { const ivec &v0 = v[k], &v1 = v[(k+1)&3], &v2 = v[(k+2)&3], &v3 = v[(k+3)&3]; if(v1[vc] == v0[vc] && v1[vr] == v2[vr] && v3[vc] == v2[vc] && v3[vr] == v0[vr]) @@ -294,13 +294,13 @@ void savec(cube *c, const ivec &o, int size, stream *f, bool nolms) { int vis = visibletris(c[i], j, co, size); if(vis&4 || faceconvexity(c[i], j) < 0) vertmask |= 0x01; - if(layerverts < 4 && vis&2) vertmask |= 0x02; + if(layerverts < 4 && vis&2) vertmask |= 0x02; } bool matchnorm = true; - loopk(numverts) - { - const vertinfo &v = verts[k]; - if(v.u || v.v) vertmask |= 0x40; + loopk(numverts) + { + const vertinfo &v = verts[k]; + if(v.u || v.v) vertmask |= 0x40; if(v.norm) { vertmask |= 0x80; if(v.norm != verts[0].norm) matchnorm = false; } } if(matchnorm) vertmask |= 0x08; @@ -321,7 +321,7 @@ void savec(cube *c, const ivec &o, int size, stream *f, bool nolms) vertmask |= 0x02 | (((k+4-vertorder)&3)<<4); break; } - } + } } } surf.verts = vertmask; @@ -349,18 +349,18 @@ void savec(cube *c, const ivec &o, int size, stream *f, bool nolms) } hasuv = false; } - } + } if(hasnorm && vertmask&0x08) { f->putlil<ushort>(verts[0].norm); hasnorm = false; } if(hasxyz || hasuv || hasnorm) loopk(layerverts) { const vertinfo &v = verts[(k+vertorder)%layerverts]; - if(hasxyz) - { - ivec xyz = v.getxyz(); - f->putlil<ushort>(xyz[vc]); f->putlil<ushort>(xyz[vr]); + if(hasxyz) + { + ivec xyz = v.getxyz(); + f->putlil<ushort>(xyz[vc]); f->putlil<ushort>(xyz[vr]); } if(hasuv) { f->putlil<ushort>(v.u); f->putlil<ushort>(v.v); } - if(hasnorm) f->putlil<ushort>(v.norm); + if(hasnorm) f->putlil<ushort>(v.norm); } if(surf.numverts&LAYER_DUP) loopk(layerverts) { @@ -408,8 +408,8 @@ void convertoldsurfaces(cube &c, const ivec &co, int size, surfacecompat *srcsur if(hassurfs&(1<<i)) { src = &srcsurfs[i]; - if(src->layer&2) - { + if(src->layer&2) + { blend = &srcsurfs[numsurfs++]; dst.lmid[0] = src->lmid; dst.lmid[1] = blend->lmid; @@ -418,7 +418,7 @@ void convertoldsurfaces(cube &c, const ivec &co, int size, surfacecompat *srcsur dst.numverts |= LAYER_DUP; } else if(src->layer == 1) { dst.lmid[1] = src->lmid; dst.numverts |= LAYER_BOTTOM; } - else { dst.lmid[0] = src->lmid; dst.numverts |= LAYER_TOP; } + else { dst.lmid[0] = src->lmid; dst.numverts |= LAYER_TOP; } } else dst.numverts |= LAYER_TOP; bool uselms = hassurfs&(1<<i) && (dst.lmid[0] >= LMID_RESERVED || dst.lmid[1] >= LMID_RESERVED || dst.numverts&~LAYER_TOP), @@ -427,7 +427,7 @@ void convertoldsurfaces(cube &c, const ivec &co, int size, surfacecompat *srcsur if(uselms || usemerges || usenorms) { ivec v[4], pos[4], e1, e2, e3, n, vo = ivec(co).mask(0xFFF).shl(3); - genfaceverts(c, i, v); + genfaceverts(c, i, v); n.cross((e1 = v[1]).sub(v[0]), (e2 = v[2]).sub(v[0])); if(usemerges) { @@ -451,7 +451,7 @@ void convertoldsurfaces(cube &c, const ivec &co, int size, surfacecompat *srcsur int convex = (e3 = v[0]).sub(v[3]).dot(n), vis = 3; if(!convex) { - if(ivec().cross(e3, e2).iszero()) { if(!n.iszero()) vis = 1; } + if(ivec().cross(e3, e2).iszero()) { if(!n.iszero()) vis = 1; } else if(n.iszero()) vis = 2; } int order = convex < 0 ? 1 : 0; @@ -488,7 +488,7 @@ void convertoldsurfaces(cube &c, const ivec &co, int size, surfacecompat *srcsur bv.v = ushort(floor(clamp((blend->y + (blend->texcoords[k*2+1] / 255.0f) * (blend->h - 1)) * float(USHRT_MAX+1)/LM_PACKH, 0.0f, float(USHRT_MAX)))); bv.norm = usenorms && normals[i].normals[k] != bvec(128, 128, 128) ? encodenormal(normals[i].normals[k].tonormal().normalize()) : 0; } - } + } } setsurfaces(c, dstsurfs, verts, totalverts); } @@ -497,7 +497,7 @@ static inline int convertoldmaterial(int mat) { return ((mat&7)<<MATF_VOLUME_SHIFT) | (((mat>>3)&3)<<MATF_CLIP_SHIFT) | (((mat>>5)&7)<<MATF_FLAG_SHIFT); } - + void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) { bool haschildren = false; @@ -519,7 +519,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) else if(mapversion <= 31) { uchar mask = f->getchar(); - if(mask & 0x80) + if(mask & 0x80) { int mat = f->getchar(); if(mapversion < 27) @@ -555,7 +555,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) if(i < 6) { if(mask & 0x40) { hasnorms |= 1<<i; f->read(&normals[i], sizeof(normalscompat)); } - if(surfaces[i].layer != 0 || surfaces[i].lmid != LMID_AMBIENT) + if(surfaces[i].layer != 0 || surfaces[i].lmid != LMID_AMBIENT) hassurfs |= 1<<i; if(surfaces[i].layer&2) numsurfs++; } @@ -603,14 +603,14 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) } } } - } - } + } + } if(hassurfs || hasnorms || hasmerges) convertoldsurfaces(c, co, size, surfaces, hassurfs, normals, hasnorms, merges, hasmerges); } else { - if(octsav&0x40) + if(octsav&0x40) { if(mapversion <= 32) { @@ -629,7 +629,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) memset(c.ext->surfaces, 0, sizeof(c.ext->surfaces)); memset(c.ext->verts(), 0, totalverts*sizeof(vertinfo)); int offset = 0; - loopi(6) if(surfmask&(1<<i)) + loopi(6) if(surfmask&(1<<i)) { surfaceinfo &surf = c.ext->surfaces[i]; f->read(&surf, sizeof(surfaceinfo)); @@ -643,9 +643,9 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) genfaceverts(c, i, v); bool hasxyz = (vertmask&0x04)!=0, hasuv = (vertmask&0x40)!=0, hasnorm = (vertmask&0x80)!=0; if(hasxyz) - { + { ivec e1, e2, e3; - n.cross((e1 = v[1]).sub(v[0]), (e2 = v[2]).sub(v[0])); + n.cross((e1 = v[1]).sub(v[0]), (e2 = v[2]).sub(v[0])); if(n.iszero()) n.cross(e2, (e3 = v[3]).sub(v[0])); bias = -n.dot(ivec(v[0]).mul(size).add(vo)); } @@ -676,7 +676,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) if(hasuv && vertmask&0x02) { int uvorder = (vertmask&0x30)>>4; - vertinfo &v0 = verts[uvorder], &v1 = verts[(uvorder+1)&3], &v2 = verts[(uvorder+2)&3], &v3 = verts[(uvorder+3)&3]; + vertinfo &v0 = verts[uvorder], &v1 = verts[(uvorder+1)&3], &v2 = verts[(uvorder+2)&3], &v3 = verts[(uvorder+3)&3]; v0.u = f->getlil<ushort>(); v0.v = f->getlil<ushort>(); v2.u = f->getlil<ushort>(); v2.v = f->getlil<ushort>(); v1.u = v0.u; v1.v = v2.v; @@ -690,7 +690,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) b3.u = b2.u; b3.v = b0.v; } hasuv = false; - } + } } if(hasnorm && vertmask&0x08) { @@ -708,7 +708,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) xyz[dim] = n[dim] ? -(bias + n[vc]*xyz[vc] + n[vr]*xyz[vr])/n[dim] : vo[dim]; v.setxyz(xyz); } - if(hasuv) { v.u = f->getlil<ushort>(); v.v = f->getlil<ushort>(); } + if(hasuv) { v.u = f->getlil<ushort>(); v.v = f->getlil<ushort>(); } if(hasnorm) v.norm = f->getlil<ushort>(); } if(surf.numverts&LAYER_DUP) loopk(layerverts) @@ -719,7 +719,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) v.norm = t.norm; } } - } + } } c.children = (haschildren ? loadchildren(f, co, size>>1, failed) : NULL); @@ -728,7 +728,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed) cube *loadchildren(stream *f, const ivec &co, int size, bool &failed) { cube *c = newcubes(); - loopi(8) + loopi(8) { loadc(f, c[i], ivec(i, co, size), size, failed); if(failed) break; @@ -771,7 +771,7 @@ void savevslot(stream *f, VSlot &vs, int prev) f->putlil<float>(vs.alphafront); f->putlil<float>(vs.alphaback); } - if(vs.changed & (1<<VSLOT_COLOR)) + if(vs.changed & (1<<VSLOT_COLOR)) { loopk(3) f->putlil<float>(vs.colorscale[k]); } @@ -792,7 +792,7 @@ void savevslots(stream *f, int numvslots) do vs = vs->next; while(vs && vs->index >= numvslots); if(!vs) break; prev[vs->index] = cur->index; - } + } } int lastroot = 0; loopi(numvslots) @@ -806,7 +806,7 @@ void savevslots(stream *f, int numvslots) if(lastroot < numvslots) f->putlil<int>(-(numvslots - lastroot)); delete[] prev; } - + void loadvslot(stream *f, VSlot &vs, int changed) { vs.changed = changed; @@ -844,7 +844,7 @@ void loadvslot(stream *f, VSlot &vs, int changed) vs.alphafront = f->getlil<float>(); vs.alphaback = f->getlil<float>(); } - if(vs.changed & (1<<VSLOT_COLOR)) + if(vs.changed & (1<<VSLOT_COLOR)) { loopk(3) vs.colorscale[k] = f->getlil<float>(); } @@ -866,7 +866,7 @@ void loadvslots(stream *f, int numvslots) else { prev[vslots.length()] = f->getlil<int>(); - loadvslot(f, *vslots.add(new VSlot(NULL, vslots.length())), changed); + loadvslot(f, *vslots.add(new VSlot(NULL, vslots.length())), changed); numvslots--; } } @@ -905,14 +905,14 @@ bool save_world(const char *mname, bool nolms) hdr.blendmap = shouldsaveblendmap(); hdr.numvars = 0; hdr.numvslots = numvslots; - enumerate(idents, ident, id, + enumerate(idents, ident, id, { if((id.type == ID_VAR || id.type == ID_FVAR || id.type == ID_SVAR) && id.flags&IDF_OVERRIDE && !(id.flags&IDF_READONLY) && id.flags&IDF_OVERRIDDEN) hdr.numvars++; }); lilswap(&hdr.version, 9); f->write(&hdr, sizeof(hdr)); - - enumerate(idents, ident, id, + + enumerate(idents, ident, id, { if((id.type!=ID_VAR && id.type!=ID_FVAR && id.type!=ID_SVAR) || !(id.flags&IDF_OVERRIDE) || id.flags&IDF_READONLY || !(id.flags&IDF_OVERRIDDEN)) continue; f->putchar(id.type); @@ -947,7 +947,7 @@ bool save_world(const char *mname, bool nolms) game::writegamedata(extras); f->putlil<ushort>(extras.length()); f->write(extras.getbuf(), extras.length()); - + f->putlil<ushort>(texmru.length()); loopv(texmru) f->putlil<ushort>(texmru[i]); char *ebuf = new char[entities::extraentinfosize()]; @@ -970,7 +970,7 @@ bool save_world(const char *mname, bool nolms) renderprogress(0, "saving octree..."); savec(worldroot, ivec(0, 0, 0), worldsize>>1, f, nolms); - if(!nolms) + if(!nolms) { if(lightmaps.length()) renderprogress(0, "saving lightmaps..."); loopv(lightmaps) @@ -1015,10 +1015,10 @@ bool load_world(const char *mname, const char *cname) // still supports a { if(f->read(&chdr.lightprecision, sizeof(chdr) - 7*sizeof(int)) != sizeof(chdr) - 7*sizeof(int)) { conoutf(CON_ERROR, "map %s has malformatted header", ogzname); delete f; return false; } } - else + else { int extra = 0; - if(hdr.version <= 29) extra++; + if(hdr.version <= 29) extra++; if(f->read(&hdr.blendmap, sizeof(hdr) - (7+extra)*sizeof(int)) != sizeof(hdr) - (7+extra)*sizeof(int)) { conoutf(CON_ERROR, "map %s has malformatted header", ogzname); delete f; return false; } } @@ -1052,10 +1052,10 @@ bool load_world(const char *mname, const char *cname) // still supports a } setsvar("maptitle", chdr.maptitle); hdr.blendmap = chdr.blendmap; - hdr.numvars = 0; + hdr.numvars = 0; hdr.numvslots = 0; } - else + else { lilswap(&hdr.blendmap, 2); if(hdr.version <= 29) hdr.numvslots = 0; @@ -1073,7 +1073,7 @@ bool load_world(const char *mname, const char *cname) // still supports a setvar("mapscale", worldscale, true, false); renderprogress(0, "loading vars..."); - + loopi(hdr.numvars) { int type = f->getchar(), ilen = f->getlil<ushort>(); @@ -1092,7 +1092,7 @@ bool load_world(const char *mname, const char *cname) // still supports a if(dbgvars) conoutf(CON_DEBUG, "read var %s: %d", name, val); break; } - + case ID_FVAR: { float val = f->getlil<float>(); @@ -1100,7 +1100,7 @@ bool load_world(const char *mname, const char *cname) // still supports a if(dbgvars) conoutf(CON_DEBUG, "read fvar %s: %f", name, val); break; } - + case ID_SVAR: { int slen = f->getlil<ushort>(); @@ -1138,7 +1138,7 @@ bool load_world(const char *mname, const char *cname) // still supports a f->read(extras.pad(extrasize), extrasize); if(samegame) game::readgamedata(extras); } - + texmru.shrink(0); if(hdr.version<14) { @@ -1195,7 +1195,7 @@ bool load_world(const char *mname, const char *cname) // still supports a } if(ebuf) delete[] ebuf; - if(hdr.numents > MAXENTS) + if(hdr.numents > MAXENTS) { conoutf(CON_WARN, "warning: map has %d entities", hdr.numents); f->seek((hdr.numents-MAXENTS)*(samegame ? sizeof(entity) + einfosize : eif), SEEK_CUR); @@ -1249,7 +1249,7 @@ bool load_world(const char *mname, const char *cname) // still supports a execfile("data/default_map_settings.cfg", false); execfile(cfgname, false); identflags &= ~IDF_OVERRIDDEN; - + extern void fixlightmapnormals(); if(hdr.version <= 25) fixlightmapnormals(); extern void fixrotatedlightmaps(); @@ -1272,7 +1272,7 @@ bool load_world(const char *mname, const char *cname) // still supports a if(maptitle[0] && strcmp(maptitle, "Untitled Map by Unknown")) conoutf(CON_ECHO, "%s", maptitle); startmap(cname ? cname : mname); - + return true; } @@ -1285,12 +1285,12 @@ COMMAND(savecurrentmap, ""); void writeobj(char *name) { defformatstring(fname, "%s.obj", name); - stream *f = openfile(path(fname), "w"); + stream *f = openfile(path(fname), "w"); if(!f) return; f->printf("# obj file of Cube 2 level\n\n"); defformatstring(mtlname, "%s.mtl", name); path(mtlname); - f->printf("mtllib %s\n\n", mtlname); + f->printf("mtllib %s\n\n", mtlname); vector<vec> verts; vector<vec2> texcoords; hashtable<vec, int> shareverts(1<<16); @@ -1318,7 +1318,7 @@ void writeobj(char *name) const vec2 &tc = v.tc; ivec2 &key = keys.add(); key.x = shareverts.access(pos, verts.length()); - if(key.x == verts.length()) + if(key.x == verts.length()) { verts.add(pos); loopl(3) @@ -1344,12 +1344,12 @@ void writeobj(char *name) if(v.y != floor(v.y)) f->printf("v %.3f ", -v.y); else f->printf("v %d ", int(-v.y)); if(v.z != floor(v.z)) f->printf("%.3f ", v.z); else f->printf("%d ", int(v.z)); if(v.x != floor(v.x)) f->printf("%.3f\n", v.x); else f->printf("%d\n", int(v.x)); - } + } f->printf("\n"); loopv(texcoords) { const vec2 &tc = texcoords[i]; - f->printf("vt %.6f %.6f\n", tc.x, 1-tc.y); + f->printf("vt %.6f %.6f\n", tc.x, 1-tc.y); } f->printf("\n"); @@ -1378,11 +1378,11 @@ void writeobj(char *name) f->printf("newmtl slot%d\n", usedmtl[i]); f->printf("map_Kd %s\n", vslot.slot->sts.empty() ? notexture->name : path(makerelpath("packages", vslot.slot->sts[0].name))); f->printf("\n"); - } + } delete f; -} - -COMMAND(writeobj, "s"); +} + +COMMAND(writeobj, "s"); #endif diff --git a/src/fpsgame/client.cpp b/src/fpsgame/client.cpp index 55da8d0..35aabd4 100644 --- a/src/fpsgame/client.cpp +++ b/src/fpsgame/client.cpp @@ -1879,7 +1879,7 @@ namespace game string oldname; copystring(oldname, getclientmap()); defformatstring(mname, "getmap_%d", lastmillis); - defformatstring(fname, "packages/base/%s.ogz", mname); + defformatstring(fname, "packages/maps/%s.ogz", mname); stream *map = openrawfile(path(fname), "wb"); if(!map) return; conoutf("received map"); @@ -1978,7 +1978,7 @@ namespace game conoutf("sending map..."); defformatstring(mname, "sendmap_%d", lastmillis); save_world(mname, true); - defformatstring(fname, "packages/base/%s.ogz", mname); + defformatstring(fname, "packages/maps/%s.ogz", mname); stream *map = openrawfile(path(fname), "rb"); if(map) { diff --git a/src/fpsgame/entities.cpp b/src/fpsgame/entities.cpp index f199c11..1410679 100644 --- a/src/fpsgame/entities.cpp +++ b/src/fpsgame/entities.cpp @@ -48,7 +48,7 @@ namespace entities { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "ammo/shells", "ammo/bullets", "ammo/rockets", "ammo/rrounds", "ammo/grenades", "ammo/cartridges", - "health", "boost", "armor/green", "armor/yellow", "quad", "teleporter", + "health", "boost", "tinyhealth", "tinyarmour", "armor/green", "armor/yellow", "quad", "teleporter", NULL, NULL, "carrot", NULL, NULL, @@ -79,7 +79,7 @@ namespace entities case I_SHELLS: case I_BULLETS: case I_ROCKETS: case I_ROUNDS: case I_GRENADES: case I_CARTRIDGES: if(m_noammo) continue; break; - case I_HEALTH: case I_BOOST: case I_GREENARMOUR: case I_YELLOWARMOUR: case I_QUAD: + case I_HEALTH: case I_BOOST: case I_TINYHEALTH: case I_TINYARMOUR: case I_GREENARMOUR: case I_YELLOWARMOUR: case I_QUAD: if(m_noitems) continue; break; } @@ -399,7 +399,7 @@ namespace entities { "none?", "light", "mapmodel", "playerstart", "envmap", "particles", "sound", "spotlight", "shells", "bullets", "rockets", "riflerounds", "grenades", "cartridges", - "health", "healthboost", "greenarmour", "yellowarmour", "quaddamage", + "health", "healthboost", "tinyhealth", "tinyarmour", "greenarmour", "yellowarmour", "quaddamage", "teleport", "teledest", "jumppad", "", "", "", "", diff --git a/src/fpsgame/game.h b/src/fpsgame/game.h index db1d394..185fd60 100644 --- a/src/fpsgame/game.h +++ b/src/fpsgame/game.h @@ -32,6 +32,7 @@ enum // static entity types SPOTLIGHT = ET_SPOTLIGHT, I_SHELLS, I_BULLETS, I_ROCKETS, I_ROUNDS, I_GRENADES, I_CARTRIDGES, I_HEALTH, I_BOOST, + /**/I_TINYHEALTH, I_TINYARMOUR, I_GREENARMOUR, I_YELLOWARMOUR, I_QUAD, TELEPORT, // attr1 = idx, attr2 = model, attr3 = tag @@ -230,8 +231,11 @@ enum HICON_SPACE = 40 }; -static struct itemstat { int add, max, sound; const char *name; int icon, info; } itemstats[] = -{ +static struct itemstat { + int add, max, sound; + const char *name; + int icon, info; +} itemstats[] = { {10, 30, S_ITEMAMMO, "SG", HICON_SG, GUN_SG}, {20, 60, S_ITEMAMMO, "CG", HICON_CG, GUN_CG}, {5, 15, S_ITEMAMMO, "RL", HICON_RL, GUN_RL}, @@ -240,6 +244,8 @@ static struct itemstat { int add, max, sound; const char *name; int icon, info; {30, 120, S_ITEMAMMO, "PI", HICON_PISTOL, GUN_PISTOL}, {25, 100, S_ITEMHEALTH, "H", HICON_HEALTH, -1}, {100, 200, S_ITEMHEALTH, "MH", HICON_HEALTH, 50}, + {5, 100, S_ITEMHEALTH, "TH", HICON_HEALTH, -1}, + {5, 50, S_ITEMARMOUR, "TA", HICON_BLUE_ARMOUR, A_BLUE}, {100, 100, S_ITEMARMOUR, "GA", HICON_GREEN_ARMOUR, A_GREEN}, {200, 200, S_ITEMARMOUR, "YA", HICON_YELLOW_ARMOUR, A_YELLOW}, {20000, 30000, S_ITEMPUP, "Q", HICON_QUAD, -1}, @@ -250,9 +256,12 @@ static struct itemstat { int add, max, sound; const char *name; int icon, info; #define EXP_SELFPUSH 2.5f #define EXP_DISTSCALE 1.5f -static const struct guninfo { int sound, attackdelay, damage, spread, projspeed, kickamount, range, rays, hitpush, exprad, ttl; const char *name, *file; short part; } guns[NUMGUNS] = -{ - // delay| dmg| spr| spd| kck| rng| ray| pus| exp| +static const struct guninfo { + int sound, attackdelay, damage, spread, projspeed, kickamount, range, rays, hitpush, exprad, ttl; + const char *name, *file; + short part; +} guns[NUMGUNS] = { + // delay| dmg| spr| spd| kck| rng| ray| pus| exp| { S_PUNCH1, 100, 30, 0, 0, 0, 30, 1, 80, 0, 0, "fist", "fist", 0 }, { S_SG, 1000, 20, 280, 0, 20, 1024, MAXRAYS, 80, 0, 0, "shotgun", "shotg", 0 }, { S_CG, 100, 20, 70, 0, 10, 1024, 1, 80, 0, 0, "chaingun", "chaing", 0 }, @@ -300,10 +309,13 @@ struct fpsstate switch(type) { case I_BOOST: return maxhealth<is.max || health<maxhealth; + case I_TINYHEALTH: return health<maxhealth; case I_HEALTH: return health<maxhealth; + case I_TINYARMOUR: + if(armourtype==A_GREEN || armourtype==A_YELLOW || armour>=50)return false; case I_GREENARMOUR: // (100h/100g only absorbs 200 damage) - if(armourtype==A_YELLOW && armour>=100) return false; + if(armourtype==A_YELLOW && armour>=100)return false; case I_YELLOWARMOUR: return !armourtype || armour<is.max; case I_QUAD: return quadmillis<is.max; default: return ammo[is.info]<is.max; @@ -316,6 +328,13 @@ struct fpsstate itemstat &is = itemstats[type-I_SHELLS]; switch(type) { + case I_TINYHEALTH: + health = min(health+is.add, maxhealth); + break; + case I_TINYARMOUR: + armour = min(armour+is.add, is.max); + armourtype = A_BLUE; + break; case I_BOOST: maxhealth = min(maxhealth+is.info, is.max); case I_HEALTH: // boost also adds to health diff --git a/src/fpsgame/game.h.gch b/src/fpsgame/game.h.gch Binary files differindex b1bc4a9..2b92d8d 100644 --- a/src/fpsgame/game.h.gch +++ b/src/fpsgame/game.h.gch diff --git a/src/fpsgame/server.cpp b/src/fpsgame/server.cpp index 158772f..7ea00a1 100644 --- a/src/fpsgame/server.cpp +++ b/src/fpsgame/server.cpp @@ -860,6 +860,8 @@ namespace server case I_GRENADES: case I_CARTRIDGES: sec = np*4; break; case I_HEALTH: sec = np*5; break; + case I_TINYHEALTH: sec = np*5; break; + case I_TINYARMOUR: sec = np*5; break; case I_GREENARMOUR: sec = 20; break; case I_YELLOWARMOUR: sec = 30; break; case I_BOOST: sec = 60; break; diff --git a/src/shared/zip.cpp b/src/shared/zip.cpp index c35fa87..40a3e9c 100644 --- a/src/shared/zip.cpp +++ b/src/shared/zip.cpp @@ -22,7 +22,7 @@ struct zipfileheader { uint signature; ushort version, needversion, flags, compression, modtime, moddate; - uint crc32, compressedsize, uncompressedsize; + uint crc32, compressedsize, uncompressedsize; ushort namelength, extralength, commentlength, disknumber, internalattribs; uint externalattribs, offset; }; @@ -43,9 +43,9 @@ struct zipfile zipfile() : name(NULL), header(0), offset(~0U), size(0), compressedsize(0) { } - ~zipfile() - { - DELETEA(name); + ~zipfile() + { + DELETEA(name); } }; @@ -89,9 +89,9 @@ static bool findzipdirectory(FILE *f, zipdirectoryheader &hdr) if(next + carry < ZIP_DIRECTORY_SIZE || fseek(f, offset, SEEK_SET) < 0 || fread(buf, 1, next, f) != next) return false; len = next + carry; uchar *search = &buf[next-1]; - for(; search >= buf; search--) if(*(uint *)search == signature) break; + for(; search >= buf; search--) if(*(uint *)search == signature) break; if(search >= buf) { src = search; break; } - } + } if(!src || &buf[len] - src < ZIP_DIRECTORY_SIZE) return false; @@ -153,7 +153,7 @@ static bool readzipdirectory(const char *archname, FILE *f, int entries, int off pname[namelen] = '\0'; path(pname); char *name = newstring(pname); - + zipfile &f = files.add(); f.name = name; f.header = hdr.offset; @@ -220,7 +220,7 @@ static void mountzip(ziparchive &arch, vector<zipfile> &files, const char *mount const char *foundpackages = strstr(f.name, packagesdir); if(foundpackages) { - if(foundpackages > f.name) + if(foundpackages > f.name) { stripdir = f.name; striplen = foundpackages - f.name; @@ -239,10 +239,10 @@ static void mountzip(ziparchive &arch, vector<zipfile> &files, const char *mount stripdir = f.name; striplen = ogzdir + 1 - f.name; } - if(!mountdir) mountdir = "packages/base/"; + if(!mountdir) mountdir = "packages/maps/"; break; } - } + } } string mdir = "", fname; if(mountdir) @@ -271,14 +271,14 @@ bool addzip(const char *name, const char *mount = NULL, const char *strip = NULL if(plen < 4 || !strchr(&pname[plen-4], '.')) concatstring(pname, ".zip"); ziparchive *exists = findzip(pname); - if(exists) + if(exists) { conoutf(CON_ERROR, "already added zip %s", pname); return true; } - + FILE *f = fopen(findfile(pname, "rb"), "rb"); - if(!f) + if(!f) { conoutf(CON_ERROR, "could not open file %s", pname); return false; @@ -291,7 +291,7 @@ bool addzip(const char *name, const char *mount = NULL, const char *strip = NULL fclose(f); return false; } - + ziparchive *arch = new ziparchive; arch->name = newstring(pname); arch->data = f; @@ -300,8 +300,8 @@ bool addzip(const char *name, const char *mount = NULL, const char *strip = NULL conoutf("added zip %s", pname); return true; -} - +} + bool removezip(const char *name) { string pname; @@ -321,7 +321,7 @@ bool removezip(const char *name) return false; } conoutf("removed zip %s", exists->name); - archives.removeobj(exists); + archives.removeobj(exists); delete exists; return true; } @@ -419,11 +419,11 @@ struct zipstream : stream { switch(whence) { - case SEEK_END: pos += info->offset + info->size; break; + case SEEK_END: pos += info->offset + info->size; break; case SEEK_CUR: pos += reading; break; case SEEK_SET: pos += info->offset; break; default: return false; - } + } pos = clamp(pos, offset(info->offset), offset(info->offset + info->size)); arch->owner = NULL; if(fseek(arch->data, int(pos), SEEK_SET) < 0) return false; @@ -432,10 +432,10 @@ struct zipstream : stream ended = false; return true; } - + switch(whence) { - case SEEK_END: pos += info->size; break; + case SEEK_END: pos += info->size; break; case SEEK_CUR: pos += zfile.total_out; break; case SEEK_SET: break; default: return false; @@ -446,7 +446,7 @@ struct zipstream : stream reading = info->offset + info->compressedsize; zfile.next_in += zfile.avail_in; zfile.avail_in = 0; - zfile.total_in = info->compressedsize; + zfile.total_in = info->compressedsize; zfile.total_out = info->size; arch->owner = NULL; ended = false; @@ -455,7 +455,7 @@ struct zipstream : stream if(pos < 0) return false; if(pos >= (offset)zfile.total_out) pos -= zfile.total_out; - else + else { if(zfile.next_in && zfile.total_in <= uint(zfile.next_in - buf)) { @@ -495,7 +495,7 @@ struct zipstream : stream if(fseek(arch->data, reading, SEEK_SET) < 0) { stopreading(); return 0; } arch->owner = this; } - + size_t n = fread(buf, 1, min(len, size_t(info->size + info->offset - reading)), arch->data); reading += n; if(n < len) ended = true; @@ -508,7 +508,7 @@ struct zipstream : stream { if(!zfile.avail_in) readbuf(BUFSIZE); int err = inflate(&zfile, Z_NO_FLUSH); - if(err != Z_OK) + if(err != Z_OK) { if(err == Z_STREAM_END) ended = true; else @@ -516,9 +516,9 @@ struct zipstream : stream #ifndef STANDALONE if(dbgzip) conoutf(CON_DEBUG, "inflate error: %s", zError(err)); #endif - stopreading(); + stopreading(); } - break; + break; } } return len - zfile.avail_out; |
