diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-27 16:07:17 +1100 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-27 16:07:17 +1100 |
| commit | f08ffe2162f9c3298f04174de7303bcbcdaf2a01 (patch) | |
| tree | 2a13b67ffdeef540dcbd387b6848b561728ef466 /source/game/StarObjectDatabase.cpp | |
| parent | b50244ade5415f9f84db9d54995faacffe6fd691 (diff) | |
| parent | 888cde79ef8f6d1b008e86207b41e1fd686c7636 (diff) | |
Merge branch 'light-test'
Diffstat (limited to 'source/game/StarObjectDatabase.cpp')
| -rw-r--r-- | source/game/StarObjectDatabase.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/game/StarObjectDatabase.cpp b/source/game/StarObjectDatabase.cpp index 67a3c67..8ed56e4 100644 --- a/source/game/StarObjectDatabase.cpp +++ b/source/game/StarObjectDatabase.cpp @@ -495,7 +495,10 @@ ObjectConfigPtr ObjectDatabase::readConfig(String const& path) { objectConfig->lightColors[pair.first] = jsonToColor(pair.second); } - objectConfig->pointLight = config.getBool("pointLight", false); + if (auto lightType = config.optString("lightType")) + objectConfig->lightType = LightTypeNames.getLeft(*lightType); + else + objectConfig->lightType = (LightType)config.getBool("pointLight", false); objectConfig->pointBeam = config.getFloat("pointBeam", 0.0f); objectConfig->beamAmbience = config.getFloat("beamAmbience", 0.0f); |