olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: tweaks to _cone support in q2

This commit is contained in:
Eric Wasylishen 2023-01-08 19:57:25 -07:00
parent df5f894726
commit 91c678254a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/settings.hh
View File

@ -166,6 +166,8 @@ public:
const T &value() const { return _value; } const T &value() const { return _value; }
const T &default_value() const { return _default; }
virtual void setValue(const T &value, source newSource) virtual void setValue(const T &value, source newSource)
{ {
if (changeSource(newSource)) { if (changeSource(newSource)) {

26
light/entities.cc
View File

@ -80,7 +80,7 @@ light_t::light_t() :
formula{this, "delay", LF_LINEAR, formula{this, "delay", LF_LINEAR,
{{"linear", LF_LINEAR}, {"inverse", LF_INVERSE}, {"inverse2", LF_INVERSE2}, {"infinite", LF_INFINITE}, {{"linear", LF_LINEAR}, {"inverse", LF_INVERSE}, {"inverse2", LF_INVERSE2}, {"infinite", LF_INFINITE},
{"localmin", LF_LOCALMIN}, {"inverse2a", LF_INVERSE2A}}}, {"localmin", LF_LOCALMIN}, {"inverse2a", LF_INVERSE2A}}},
cone{this, {"cone"}, 10.f}, cone{this, "cone", 10.f},
spotangle{this, "angle", 40.0}, spotangle{this, "angle", 40.0},
spotangle2{this, "softangle", 0.0}, spotangle2{this, "softangle", 0.0},
style{this, "style", 0, 0, INVALID_LIGHTSTYLE - 1}, style{this, "style", 0, 0, INVALID_LIGHTSTYLE - 1},
@ -235,7 +235,7 @@ bool EntDict_CheckNoEmptyValues(const mbsp_t *bsp, const entdict_t &entdict)
return ok; return ok;
} }
static void SetupSpotlights(const settings::worldspawn_keys &cfg) static void SetupSpotlights(const mbsp_t *bsp, const settings::worldspawn_keys &cfg)
{ {
for (auto &entity : all_lights) { for (auto &entity : all_lights) {
vec_t targetdist = 0.0; // mxd vec_t targetdist = 0.0; // mxd
@ -247,20 +247,22 @@ static void SetupSpotlights(const settings::worldspawn_keys &cfg)
entity->spotlight = true; entity->spotlight = true;
} }
if (entity->spotlight) { if (entity->spotlight) {
vec_t base_angle = 0.0; // spotlight cone "diameter" in degrees
vec_t base_angle;
if (entity->cone.isChanged()) { if (entity->cone.isChanged()) {
// q2 style: "_cone" key specifies cone radius in degrees
base_angle = entity->cone.value() * 2.f; base_angle = entity->cone.value() * 2.f;
if (!base_angle) {
base_angle = 10.f;
}
} else { } else {
// q1 style: "angle" key specifies cone diameter in degrees
base_angle = entity->spotangle.value(); base_angle = entity->spotangle.value();
}
if (!base_angle) { if (!base_angle) {
base_angle = 40.f; // if we don't have a valid cone angle, the default depends on the target game
if (bsp->loadversion->game->id == GAME_QUAKE_II) {
base_angle = entity->cone.default_value() * 2.f;
} else {
base_angle = entity->spotangle.default_value();
} }
} }
@ -325,7 +327,7 @@ static void CheckEntityFields(const mbsp_t *bsp, const settings::worldspawn_keys
if (!entity->surface_minlight_scale.isChanged()) { if (!entity->surface_minlight_scale.isChanged()) {
if (bsp->loadversion->game->id != GAME_QUAKE_II) { if (bsp->loadversion->game->id != GAME_QUAKE_II) {
// TODO: also use 1.0 for Q2? // TODO: also use 1.0 for Q2?
entity->surface_minlight_scale.setValue(64.f, settings::source::DEFAULT); entity->surface_minlight_scale.setValue(1.0f, settings::source::DEFAULT);
} }
} }
} }
@ -1159,7 +1161,7 @@ void SetupLights(const settings::worldspawn_keys &cfg, const mbsp_t *bsp)
const size_t final_lightcount = all_lights.size(); const size_t final_lightcount = all_lights.size();
MatchTargets(); MatchTargets();
SetupSpotlights(cfg); SetupSpotlights(bsp, cfg);
SetupSuns(cfg); SetupSuns(cfg);
SetupSkyDomes(cfg); SetupSkyDomes(cfg);
FixLightsOnFaces(bsp); FixLightsOnFaces(bsp);