mirror of https://github.com/ZDoom/gzdoom.git
- GZDoom differences to /wadsrc.
This commit is contained in:
Christoph Oelckers
parent
54f06739d0
commit
71e65ed116
|
|
@ -2,10 +2,11 @@ cmake_minimum_required( VERSION 2.4 )
|
|||
|
||||
get_target_property(ZIPDIR_EXE zipdir LOCATION)
|
||||
|
||||
add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/zdoom.pk3
|
||||
COMMAND ${ZIPDIR_EXE} -udf ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 $<TARGET_FILE_DIR:zdoom>
|
||||
add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/gzdoom.pk3
|
||||
COMMAND ${ZIPDIR_EXE} -udf ${ZDOOM_OUTPUT_DIR}/gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZDOOM_OUTPUT_DIR}/gzdoom.pk3 $<TARGET_FILE_DIR:zdoom>
|
||||
DEPENDS zipdir ${CMAKE_CURRENT_SOURCE_DIR}/static )
|
||||
|
||||
add_custom_target( pk3 ALL
|
||||
DEPENDS ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 )
|
||||
DEPENDS ${ZDOOM_OUTPUT_DIR}/gzdoom.pk3 )
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Actor ArmorBonus : BasicArmorBonus 2015
|
|||
Radius 20
|
||||
Height 16
|
||||
Inventory.Pickupmessage "$GOTARMBONUS"
|
||||
Inventory.Icon "ARM1A0"
|
||||
Inventory.Icon "BON2A0"
|
||||
Armor.Savepercent 33.335
|
||||
Armor.Saveamount 1
|
||||
Armor.Maxsaveamount 200
|
||||
|
|
|
|||
|
|
@ -0,0 +1,102 @@
|
|||
ACTOR DynamicLight native
|
||||
{
|
||||
Height 0
|
||||
Radius 0.1
|
||||
FloatBobPhase 0
|
||||
+NOBLOCKMAP
|
||||
+NOGRAVITY
|
||||
+FIXMAPTHINGPOS
|
||||
+INVISIBLE
|
||||
}
|
||||
|
||||
|
||||
ACTOR PointLight : DynamicLight 9800
|
||||
{
|
||||
DynamicLight.Type "Point"
|
||||
}
|
||||
|
||||
ACTOR PointLightPulse : PointLight 9801
|
||||
{
|
||||
DynamicLight.Type "Pulse"
|
||||
}
|
||||
|
||||
ACTOR PointLightFlicker : PointLight 9802
|
||||
{
|
||||
DynamicLight.Type "Flicker"
|
||||
}
|
||||
|
||||
ACTOR SectorPointLight : PointLight 9803
|
||||
{
|
||||
DynamicLight.Type "Sector"
|
||||
}
|
||||
|
||||
ACTOR PointLightFlickerRandom : PointLight 9804
|
||||
{
|
||||
DynamicLight.Type "RandomFlicker"
|
||||
}
|
||||
|
||||
// MISSILEMORE and MISSILEEVENMORE are used by the lights for additive and subtractive lights
|
||||
|
||||
ACTOR PointLightAdditive : PointLight 9810
|
||||
{
|
||||
+MISSILEMORE
|
||||
}
|
||||
|
||||
ACTOR PointLightPulseAdditive : PointLightPulse 9811
|
||||
{
|
||||
+MISSILEMORE
|
||||
}
|
||||
|
||||
ACTOR PointLightFlickerAdditive : PointLightFlicker 9812
|
||||
{
|
||||
+MISSILEMORE
|
||||
}
|
||||
|
||||
ACTOR SectorPointLightAdditive : SectorPointLight 9813
|
||||
{
|
||||
+MISSILEMORE
|
||||
}
|
||||
|
||||
ACTOR PointLightFlickerRandomAdditive :PointLightFlickerRandom 9814
|
||||
{
|
||||
+MISSILEMORE
|
||||
}
|
||||
|
||||
ACTOR PointLightSubtractive : PointLight 9820
|
||||
{
|
||||
+MISSILEEVENMORE
|
||||
}
|
||||
|
||||
ACTOR PointLightPulseSubtractive : PointLightPulse 9821
|
||||
{
|
||||
+MISSILEEVENMORE
|
||||
}
|
||||
|
||||
ACTOR PointLightFlickerSubtractive : PointLightFlicker 9822
|
||||
{
|
||||
+MISSILEEVENMORE
|
||||
}
|
||||
|
||||
ACTOR SectorPointLightSubtractive : SectorPointLight 9823
|
||||
{
|
||||
+MISSILEEVENMORE
|
||||
}
|
||||
|
||||
ACTOR PointLightFlickerRandomSubtractive : PointLightFlickerRandom 9824
|
||||
{
|
||||
+MISSILEEVENMORE
|
||||
}
|
||||
|
||||
|
||||
ACTOR VavoomLight : DynamicLight 9825 native
|
||||
{
|
||||
}
|
||||
|
||||
ACTOR VavoomLightWhite : VavoomLight 1502 native
|
||||
{
|
||||
}
|
||||
|
||||
ACTOR VavoomLightColor : VavoomLight 1503 native
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,246 @@
|
|||
OptionValue "SpriteclipModes"
|
||||
{
|
||||
0, "Never"
|
||||
1, "Smart"
|
||||
2, "Always"
|
||||
3, "Smarter"
|
||||
}
|
||||
|
||||
OptionValue "EnhancedStealth"
|
||||
{
|
||||
0, "Never"
|
||||
1, "Infrared only"
|
||||
2, "Infrared and torch"
|
||||
3, "Any fixed colormap"
|
||||
}
|
||||
|
||||
OptionValue "VBOModes"
|
||||
{
|
||||
0, "Off"
|
||||
1, "Static"
|
||||
2, "Dynamic"
|
||||
}
|
||||
|
||||
OptionValue "FilterModes"
|
||||
{
|
||||
0, "None"
|
||||
1, "None (nearest mipmap)"
|
||||
5, "None (linear mipmap)"
|
||||
2, "Linear"
|
||||
3, "Bilinear"
|
||||
4, "Trilinear"
|
||||
}
|
||||
|
||||
OptionValue "TextureFormats"
|
||||
{
|
||||
0, "RGBA8"
|
||||
1, "RGB5_A1"
|
||||
2, "RGBA4"
|
||||
3, "RGBA2"
|
||||
// [BB] Added modes for texture compression.
|
||||
4, "COMPR_RGBA"
|
||||
5, "S3TC_DXT1"
|
||||
6, "S3TC_DXT3"
|
||||
7, "S3TC_DXT5"
|
||||
}
|
||||
|
||||
OptionValue "Anisotropy"
|
||||
{
|
||||
1, "Off"
|
||||
2, "2x"
|
||||
4, "4x"
|
||||
8, "8x"
|
||||
16, "16x"
|
||||
}
|
||||
|
||||
OptionValue "Colormaps"
|
||||
{
|
||||
0, "Use as palette"
|
||||
1, "Blend"
|
||||
}
|
||||
|
||||
OptionValue "LightingModes"
|
||||
{
|
||||
0, "Standard"
|
||||
1, "Bright"
|
||||
2, "Doom"
|
||||
3, "Dark"
|
||||
4, "Legacy"
|
||||
8, "Software"
|
||||
}
|
||||
|
||||
OptionValue "Precision"
|
||||
{
|
||||
0, "Speed"
|
||||
1, "Quality"
|
||||
}
|
||||
|
||||
|
||||
OptionValue "Hz"
|
||||
{
|
||||
0, "Optimal"
|
||||
60, "60"
|
||||
70, "70"
|
||||
72, "72"
|
||||
75, "75"
|
||||
85, "85"
|
||||
100, "100"
|
||||
}
|
||||
|
||||
OptionValue "BillboardModes"
|
||||
{
|
||||
0, "Y Axis"
|
||||
1, "X/Y Axis"
|
||||
}
|
||||
|
||||
|
||||
OptionValue "Particles"
|
||||
{
|
||||
0, "Square"
|
||||
1, "Round"
|
||||
2, "Smooth"
|
||||
}
|
||||
|
||||
OptionValue "HqResizeModes"
|
||||
{
|
||||
0, "Off"
|
||||
1, "Scale2x"
|
||||
2, "Scale3x"
|
||||
3, "Scale4x"
|
||||
4, "hq2x"
|
||||
5, "hq3x"
|
||||
6, "hq4x"
|
||||
}
|
||||
|
||||
OptionValue "HqResizeTargets"
|
||||
{
|
||||
0, "Everything"
|
||||
1, "Sprites/fonts"
|
||||
}
|
||||
|
||||
OptionValue "FogMode"
|
||||
{
|
||||
0, "Off"
|
||||
1, "Standard"
|
||||
2, "Radial"
|
||||
}
|
||||
|
||||
OptionValue "FuzzStyle"
|
||||
{
|
||||
0, "Shadow"
|
||||
1, "Pixel fuzz"
|
||||
2, "Smooth fuzz"
|
||||
3, "Swirly fuzz"
|
||||
4, "Translucent fuzz"
|
||||
6, "Noise"
|
||||
7, "Smooth Noise"
|
||||
//5, "Jagged fuzz" I can't see any difference between this and 4 so it's disabled for now.
|
||||
}
|
||||
|
||||
OptionMenu "GLTextureGLOptions"
|
||||
{
|
||||
Title "TEXTURE OPTIONS"
|
||||
Option "Textures enabled", gl_texture, "YesNo"
|
||||
Option "Texture Filter mode", gl_texture_filter, "FilterModes"
|
||||
Option "Anisotropic filter", gl_texture_filter_anisotropic, "Anisotropy"
|
||||
Option "Texture Format", gl_texture_format, "TextureFormats"
|
||||
Option "Enable hires textures", gl_texture_usehires, "YesNo"
|
||||
Option "High Quality Resize mode", gl_texture_hqresize, "HqResizeModes"
|
||||
Option "Resize textures", gl_texture_hqresize_textures, "OnOff"
|
||||
Option "Resize sprites", gl_texture_hqresize_sprites, "OnOff"
|
||||
Option "Resize fonts", gl_texture_hqresize_fonts, "OnOff"
|
||||
Option "Precache GL textures", gl_precache, "YesNo"
|
||||
Option "Camera textures offscreen", gl_usefb, "OnOff"
|
||||
Option "Trim sprite edges", gl_trimsprites, "OnOff"
|
||||
}
|
||||
|
||||
OptionMenu "GLLightOptions"
|
||||
{
|
||||
Title "DYNAMIC LIGHTS"
|
||||
Option "Dynamic Lights enabled", gl_lights, "YesNo"
|
||||
Option "Enable light definitions", gl_attachedlights, "YesNo"
|
||||
Option "Clip lights", gl_lights_checkside, "YesNo"
|
||||
Option "Lights affect sprites", gl_light_sprites, "YesNo"
|
||||
Option "Lights affect particles", gl_light_particles, "YesNo"
|
||||
Option "Force additive lighting", gl_lights_additive, "YesNo"
|
||||
Slider "Light intensity", gl_lights_intensity, 0.0, 1.0, 0.1
|
||||
Slider "Light size", gl_lights_size, 0.0, 2.0, 0.1
|
||||
Option "Use shaders for lights", gl_dynlight_shader, "YesNo"
|
||||
}
|
||||
|
||||
OptionMenu "GLPrefOptions"
|
||||
{
|
||||
Title "OPENGL PREFERENCES"
|
||||
Option "Sector light mode", gl_lightmode, "LightingModes"
|
||||
Option "Fog mode", gl_fogmode, "FogMode"
|
||||
Option "Fog forces fullbright", gl_brightfog, "YesNo"
|
||||
Slider "Weapon light strength", gl_weaponlight, 0,32, 2
|
||||
Option "Environment map on mirrors",gl_mirror_envmap, "OnOff"
|
||||
Option "Enhanced night vision mode",gl_enhanced_nightvision, "OnOff"
|
||||
Option "ENV shows stealth monsters",gl_enhanced_nv_stealth, "EnhancedStealth"
|
||||
Option "Force brightness in fog", gl_spritebrightfog, "OnOff"
|
||||
Option "Adjust sprite clipping", gl_spriteclip, "SpriteclipModes"
|
||||
Option "Smooth sprite edges", gl_sprite_blend, "OnOff"
|
||||
Option "Fuzz Style", gl_fuzztype, "FuzzStyle"
|
||||
Option "Sprite billboard", gl_billboard_mode, "BillboardModes"
|
||||
Option "Particle style", gl_particles_style, "Particles"
|
||||
Slider "Ambient light level", gl_light_ambient, 1.0, 255.0, 5.0
|
||||
Option "Rendering quality", gl_render_precise, "Precision"
|
||||
Option "Use vertex buffer", gl_usevbo, "VBOModes"
|
||||
}
|
||||
|
||||
OptionMenu "GLShaderOptions"
|
||||
{
|
||||
Title "SHADER OPTIONS"
|
||||
Option "Enable brightness maps", gl_brightmap_shader, "OnOff"
|
||||
Option "Shaders for texture warp", gl_warp_shader, "OnOff"
|
||||
Option "Shaders for fog", gl_fog_shader, "OnOff"
|
||||
Option "Shaders for colormaps", gl_colormap_shader, "OnOff"
|
||||
Option "Shaders for glowing textures", gl_glow_shader, "OnOff"
|
||||
}
|
||||
|
||||
OptionMenu "OpenGLOptions"
|
||||
{
|
||||
Title "OPENGL OPTIONS"
|
||||
Submenu "Dynamic Light Options", "GLLightOptions"
|
||||
Submenu "Texture Options", "GLTextureGLOptions"
|
||||
Submenu "Shader Options", "GLShaderOptions"
|
||||
Submenu "Preferences", "GLPrefOptions"
|
||||
}
|
||||
|
||||
OptionMenu "VideoOptions"
|
||||
{
|
||||
Title "DISPLAY OPTIONS"
|
||||
|
||||
Submenu "OpenGL Options", "OpenGLOptions"
|
||||
Submenu "Scoreboard Options", "ScoreboardOptions"
|
||||
StaticText " "
|
||||
Slider "Screen size", "screenblocks", 3.0, 12.0, 1.0, 0
|
||||
|
||||
Slider "Gamma correction", "Gamma", 0.75, 3.0, 0.05, 2
|
||||
Slider "Brightness", "vid_brightness", -0.8,0.8, 0.05
|
||||
Slider "Contrast", "vid_contrast", 0.1, 3.0, 0.1
|
||||
|
||||
Option "Vertical Sync", "vid_vsync", "OnOff"
|
||||
|
||||
StaticText " "
|
||||
Option "Screen wipe style", "wipetype", "Wipes"
|
||||
|
||||
IfOption(Windows)
|
||||
{
|
||||
Option "Show ENDOOM screen", "showendoom", "Endoom"
|
||||
}
|
||||
|
||||
Option "Stretch short skies", "r_stretchsky", "OnOff"
|
||||
Option "Use fuzz effect", "r_drawfuzz", "Fuzziness"
|
||||
Slider "Lost Soul translucency", "transsouls", 0.25, 1.0, 0.05, 2
|
||||
Option "Use fake contrast", "r_fakecontrast", "Contrast"
|
||||
Option "Rocket Trails", "cl_rockettrails", "RocketTrailTypes"
|
||||
Option "Blood Type", "cl_bloodtype", "BloodTypes"
|
||||
Option "Bullet Puff Type", "cl_pufftype", "PuffTypes"
|
||||
Slider "Number of particles", "r_maxparticles", 100, 10000, 100, 0
|
||||
Option "Show player sprites", "r_drawplayersprites", "OnOff"
|
||||
Option "Death camera", "r_deathcamera", "OnOff"
|
||||
Option "Teleporter zoom", "telezoom", "OnOff"
|
||||
Option "Interpolate monster movement", "nomonsterinterpolation", "NoYes"
|
||||
}
|
||||
|
|
@ -36,8 +36,8 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Checking zdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)zdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)zdoom.pk3" "$(SolutionDir)..\zdoom.pk3""
|
||||
Description="Checking gzdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)gzdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)gzdoom.pk3" "$(SolutionDir)..\gzdoom.pk3""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
|
|
@ -58,8 +58,8 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Checking zdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)zdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)zdoom.pk3" "$(SolutionDir)..\zdoom.pk3""
|
||||
Description="Checking gzdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)gzdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)gzdoom.pk3" "$(SolutionDir)..\gzdoom.pk3""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
|
|
@ -80,8 +80,8 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Checking zdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)zdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)zdoom.pk3" "$(SolutionDir)..\zdoom.pk3"
"
|
||||
Description="Checking gzdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)gzdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)gzdoom.pk3" "$(SolutionDir)..\gzdoom.pk3""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
|
|
@ -102,8 +102,8 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Checking zdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)zdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)zdoom.pk3" "$(SolutionDir)..\zdoom.pk3"
"
|
||||
Description="Checking gzdoom.pk3..."
|
||||
CommandLine=""$(SolutionDir)tools\zipdir\zipdir.exe" -ud "$(InputDir)gzdoom.pk3" "$(InputDir)static" 
copy "$(InputDir)gzdoom.pk3" "$(SolutionDir)..\gzdoom.pk3""
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
|
|
|
|||
Loading…
Reference in New Issue