BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix uninitialized value warning

Browse Source
This commit is contained in:
Matvey Cherevko
2019-08-22 09:29:52 +07:00
parent bbefa65d98
commit 63cd712bd2
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sources/enduro2d/high/assets/material_asset.cpp
View File

@@ -164,7 +164,7 @@ namespace
},
"sampler" : {
"type" : "object",
"required" : [ "name" ],
"required" : [ "name", "texture" ],
"additionalProperties" : false,
"properties" : {
"name" : {
@@ -201,7 +201,7 @@ namespace
},
"property" : {
"type" : "object",
"required" : [ "name", "type" ],
"required" : [ "name", "type", "value" ],
"additionalProperties" : false,
"properties" : {
"name" : { "$ref" : "#/common_definitions/name" },
@@ -514,11 +514,10 @@ namespace
render::sampler_state content;
E2D_ASSERT(root.HasMember("name") && root["name"].IsString());
auto name_hash = make_hash(root["name"].GetString());
E2D_ASSERT(root.HasMember("texture") && root["texture"].IsString());
auto texture_p = root.HasMember("texture")
? parse_texture_block(library, parent_address, root["texture"])
: stdex::make_resolved_promise<texture_ptr>(nullptr);
auto name_hash = make_hash(root["name"].GetString());
auto texture_p = parse_texture_block(library, parent_address, root["texture"]);
if ( root.HasMember("wrap") ) {
const auto& wrap_json = root["wrap"];
@@ -609,15 +608,14 @@ namespace
E2D_ASSERT(property_json.HasMember("name") && property_json["name"].IsString());
E2D_ASSERT(property_json.HasMember("type") && property_json["type"].IsString());
E2D_ASSERT(property_json.HasMember("value"));
#define DEFINE_CASE(x)\
if ( 0 == std::strcmp(property_json["type"].GetString(), #x) ) {\
x value;\
if ( property_json.HasMember("value") ) {\
if ( !json_utils::try_parse_value(property_json["value"], value) ) {\
E2D_ASSERT_MSG(false, "unexpected property value");\
return false;\
}\
if ( !json_utils::try_parse_value(property_json["value"], value) ) {\
E2D_ASSERT_MSG(false, "unexpected property value");\
return false;\
}\
props.property(property_json["name"].GetString(), value);\
continue;\