summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/bgfx/paramreader.cpp
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-23 17:55:55 +0100
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-23 17:55:55 +0100
commitba0a1d8d5218804bc1d5b09d5b3fa8fcd537f0bf (patch)
tree9fe5ca6f9f6352f724ea9a26fff5ebda23576607 /src/osd/modules/render/bgfx/paramreader.cpp
parentd0867ac3f2bdcfd4d1d2361ce8b6408a185908f4 (diff)
parent5ed9f938ea322d386e949d2752892651d9ee9fde (diff)
Merge bgfx_shader into master, nw
Diffstat (limited to 'src/osd/modules/render/bgfx/paramreader.cpp')
-rw-r--r--src/osd/modules/render/bgfx/paramreader.cpp53
1 files changed, 40 insertions, 13 deletions
diff --git a/src/osd/modules/render/bgfx/paramreader.cpp b/src/osd/modules/render/bgfx/paramreader.cpp
index 39a995a1489..f8225c39457 100644
--- a/src/osd/modules/render/bgfx/paramreader.cpp
+++ b/src/osd/modules/render/bgfx/paramreader.cpp
@@ -11,28 +11,55 @@
#include "paramreader.h"
#include "parameter.h"
+#include "frameparameter.h"
+#include "windowparameter.h"
+#include "timeparameter.h"
const parameter_reader::string_to_enum parameter_reader::TYPE_NAMES[parameter_reader::TYPE_COUNT] = {
- { "frame_mask", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK) }
+ { "frame", bgfx_parameter::parameter_type::PARAM_FRAME },
+ { "window", bgfx_parameter::parameter_type::PARAM_WINDOW },
+ { "time", bgfx_parameter::parameter_type::PARAM_TIME }
};
-bgfx_parameter* parameter_reader::read_from_value(const Value& value)
+bgfx_parameter* parameter_reader::read_from_value(const Value& value, std::string prefix, uint32_t window_index)
{
- validate_parameters(value);
+ if (!validate_parameters(value, prefix))
+ {
+ return nullptr;
+ }
std::string name = value["name"].GetString();
- bgfx_parameter::parameter_type type = bgfx_parameter::parameter_type(get_enum_from_value(value, "type", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK), TYPE_NAMES, TYPE_COUNT));
- int period = int(value["period"].GetDouble());
+ bgfx_parameter::parameter_type type = bgfx_parameter::parameter_type(get_enum_from_value(value, "type", bgfx_parameter::parameter_type::PARAM_FRAME, TYPE_NAMES, TYPE_COUNT));
- return new bgfx_parameter(name, type, period);
+ if (type == bgfx_parameter::parameter_type::PARAM_FRAME)
+ {
+ uint32_t period = int(value["period"].GetDouble());
+ return new bgfx_frame_parameter(name, type, period);
+ }
+ else if (type == bgfx_parameter::parameter_type::PARAM_WINDOW)
+ {
+ return new bgfx_window_parameter(name, type, window_index);
+ }
+ else if (type == bgfx_parameter::parameter_type::PARAM_TIME)
+ {
+ float limit = float(value["limit"].GetDouble());
+ return new bgfx_time_parameter(name, type, limit);
+ }
+ else
+ {
+ READER_CHECK(false, (prefix + "Unknown parameter type '" + std::string(value["type"].GetString()) + "'\n").c_str());
+ }
+
+ return nullptr;
}
-void parameter_reader::validate_parameters(const Value& value)
+bool parameter_reader::validate_parameters(const Value& value, std::string prefix)
{
- assert(value.HasMember("name"));
- assert(value["name"].IsString());
- assert(value.HasMember("type"));
- assert(value["type"].IsString());
- assert(value.HasMember("period"));
- assert(value["period"].IsDouble());
+ if (!READER_CHECK(value.HasMember("name"), (prefix + "Must have string value 'name'\n").c_str())) return false;
+ if (!READER_CHECK(value["name"].IsString(), (prefix + "Value 'name' must be a string\n").c_str())) return false;
+ if (!READER_CHECK(value.HasMember("type"), (prefix + "Must have string value 'type'\n").c_str())) return false;
+ if (!READER_CHECK(value["type"].IsString(), (prefix + "Value 'type' must be a string\n").c_str())) return false;
+ if (!READER_CHECK(!value.HasMember("period") || value["period"].IsNumber(), (prefix + "Value 'period' must be numeric\n").c_str())) return false;
+ if (!READER_CHECK(!value.HasMember("limit") || value["limit"].IsNumber(), (prefix + "Value 'period' must be numeric\n").c_str())) return false;
+ return true;
}