Skip to content

Commit aa9359d

Browse files
alexchicnalexchicn
committed
check the float type by IsNumber 
1 parent 8de304d commit aa9359d

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎source/libgltf/libgltfparser.cpp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace libgltf
7676

7777
bool operator<<(float& _rData, const GLTFCharValue& _JsonValue)
7878
{
79-
if (_JsonValue.IsFloat())
79+
if (_JsonValue.IsNumber())
8080
{
8181
_rData = _JsonValue.GetFloat();
8282
return true;
@@ -1022,19 +1022,19 @@ namespace libgltf
10221022
SGlTFProperty& super_ptr = _rData;
10231023
if (!(super_ptr << _JsonValue)) return false;
10241024
}
1025-
if (_JsonValue.HasMember(GLTFTEXT("xmag")) && _JsonValue[GLTFTEXT("xmag")].IsFloat())
1025+
if (_JsonValue.HasMember(GLTFTEXT("xmag")) && _JsonValue[GLTFTEXT("xmag")].IsNumber())
10261026
{
10271027
_rData.xmag = _JsonValue[GLTFTEXT("xmag")].GetFloat();
10281028
}
1029-
if (_JsonValue.HasMember(GLTFTEXT("ymag")) && _JsonValue[GLTFTEXT("ymag")].IsFloat())
1029+
if (_JsonValue.HasMember(GLTFTEXT("ymag")) && _JsonValue[GLTFTEXT("ymag")].IsNumber())
10301030
{
10311031
_rData.ymag = _JsonValue[GLTFTEXT("ymag")].GetFloat();
10321032
}
1033-
if (_JsonValue.HasMember(GLTFTEXT("zfar")) && _JsonValue[GLTFTEXT("zfar")].IsFloat())
1033+
if (_JsonValue.HasMember(GLTFTEXT("zfar")) && _JsonValue[GLTFTEXT("zfar")].IsNumber())
10341034
{
10351035
_rData.zfar = _JsonValue[GLTFTEXT("zfar")].GetFloat();
10361036
}
1037-
if (_JsonValue.HasMember(GLTFTEXT("znear")) && _JsonValue[GLTFTEXT("znear")].IsFloat())
1037+
if (_JsonValue.HasMember(GLTFTEXT("znear")) && _JsonValue[GLTFTEXT("znear")].IsNumber())
10381038
{
10391039
_rData.znear = _JsonValue[GLTFTEXT("znear")].GetFloat();
10401040
}
@@ -1103,19 +1103,19 @@ namespace libgltf
11031103
SGlTFProperty& super_ptr = _rData;
11041104
if (!(super_ptr << _JsonValue)) return false;
11051105
}
1106-
if (_JsonValue.HasMember(GLTFTEXT("aspectRatio")) && _JsonValue[GLTFTEXT("aspectRatio")].IsFloat())
1106+
if (_JsonValue.HasMember(GLTFTEXT("aspectRatio")) && _JsonValue[GLTFTEXT("aspectRatio")].IsNumber())
11071107
{
11081108
_rData.aspectRatio = _JsonValue[GLTFTEXT("aspectRatio")].GetFloat();
11091109
}
1110-
if (_JsonValue.HasMember(GLTFTEXT("yfov")) && _JsonValue[GLTFTEXT("yfov")].IsFloat())
1110+
if (_JsonValue.HasMember(GLTFTEXT("yfov")) && _JsonValue[GLTFTEXT("yfov")].IsNumber())
11111111
{
11121112
_rData.yfov = _JsonValue[GLTFTEXT("yfov")].GetFloat();
11131113
}
1114-
if (_JsonValue.HasMember(GLTFTEXT("zfar")) && _JsonValue[GLTFTEXT("zfar")].IsFloat())
1114+
if (_JsonValue.HasMember(GLTFTEXT("zfar")) && _JsonValue[GLTFTEXT("zfar")].IsNumber())
11151115
{
11161116
_rData.zfar = _JsonValue[GLTFTEXT("zfar")].GetFloat();
11171117
}
1118-
if (_JsonValue.HasMember(GLTFTEXT("znear")) && _JsonValue[GLTFTEXT("znear")].IsFloat())
1118+
if (_JsonValue.HasMember(GLTFTEXT("znear")) && _JsonValue[GLTFTEXT("znear")].IsNumber())
11191119
{
11201120
_rData.znear = _JsonValue[GLTFTEXT("znear")].GetFloat();
11211121
}
@@ -1993,7 +1993,7 @@ namespace libgltf
19931993
STextureInfo& super_ptr = _rData;
19941994
if (!(super_ptr << _JsonValue)) return false;
19951995
}
1996-
if (_JsonValue.HasMember(GLTFTEXT("scale")) && _JsonValue[GLTFTEXT("scale")].IsFloat())
1996+
if (_JsonValue.HasMember(GLTFTEXT("scale")) && _JsonValue[GLTFTEXT("scale")].IsNumber())
19971997
{
19981998
_rData.scale = _JsonValue[GLTFTEXT("scale")].GetFloat();
19991999
}
@@ -2047,7 +2047,7 @@ namespace libgltf
20472047
STextureInfo& super_ptr = _rData;
20482048
if (!(super_ptr << _JsonValue)) return false;
20492049
}
2050-
if (_JsonValue.HasMember(GLTFTEXT("strength")) && _JsonValue[GLTFTEXT("strength")].IsFloat())
2050+
if (_JsonValue.HasMember(GLTFTEXT("strength")) && _JsonValue[GLTFTEXT("strength")].IsNumber())
20512051
{
20522052
_rData.strength = _JsonValue[GLTFTEXT("strength")].GetFloat();
20532053
}
@@ -2109,11 +2109,11 @@ namespace libgltf
21092109
{
21102110
if (!(_rData.baseColorTexture << _JsonValue[GLTFTEXT("baseColorTexture")])) return false;
21112111
}
2112-
if (_JsonValue.HasMember(GLTFTEXT("metallicFactor")) && _JsonValue[GLTFTEXT("metallicFactor")].IsFloat())
2112+
if (_JsonValue.HasMember(GLTFTEXT("metallicFactor")) && _JsonValue[GLTFTEXT("metallicFactor")].IsNumber())
21132113
{
21142114
_rData.metallicFactor = _JsonValue[GLTFTEXT("metallicFactor")].GetFloat();
21152115
}
2116-
if (_JsonValue.HasMember(GLTFTEXT("roughnessFactor")) && _JsonValue[GLTFTEXT("roughnessFactor")].IsFloat())
2116+
if (_JsonValue.HasMember(GLTFTEXT("roughnessFactor")) && _JsonValue[GLTFTEXT("roughnessFactor")].IsNumber())
21172117
{
21182118
_rData.roughnessFactor = _JsonValue[GLTFTEXT("roughnessFactor")].GetFloat();
21192119
}
@@ -2218,7 +2218,7 @@ namespace libgltf
22182218
{
22192219
_rData.alphaMode = _JsonValue[GLTFTEXT("alphaMode")].GetString();
22202220
}
2221-
if (_JsonValue.HasMember(GLTFTEXT("alphaCutoff")) && _JsonValue[GLTFTEXT("alphaCutoff")].IsFloat())
2221+
if (_JsonValue.HasMember(GLTFTEXT("alphaCutoff")) && _JsonValue[GLTFTEXT("alphaCutoff")].IsNumber())
22222222
{
22232223
_rData.alphaCutoff = _JsonValue[GLTFTEXT("alphaCutoff")].GetFloat();
22242224
}
@@ -3074,7 +3074,7 @@ namespace libgltf
30743074
{
30753075
if (!(_rData.color << _JsonValue[GLTFTEXT("color")])) return false;
30763076
}
3077-
if (_JsonValue.HasMember(GLTFTEXT("intensity")) && _JsonValue[GLTFTEXT("intensity")].IsFloat())
3077+
if (_JsonValue.HasMember(GLTFTEXT("intensity")) && _JsonValue[GLTFTEXT("intensity")].IsNumber())
30783078
{
30793079
_rData.intensity = _JsonValue[GLTFTEXT("intensity")].GetFloat();
30803080
}
@@ -3086,7 +3086,7 @@ namespace libgltf
30863086
{
30873087
_rData.type = _JsonValue[GLTFTEXT("type")].GetString();
30883088
}
3089-
if (_JsonValue.HasMember(GLTFTEXT("range")) && _JsonValue[GLTFTEXT("range")].IsFloat())
3089+
if (_JsonValue.HasMember(GLTFTEXT("range")) && _JsonValue[GLTFTEXT("range")].IsNumber())
30903090
{
30913091
_rData.range = _JsonValue[GLTFTEXT("range")].GetFloat();
30923092
}
@@ -3162,11 +3162,11 @@ namespace libgltf
31623162
SGlTFProperty& super_ptr = _rData;
31633163
if (!(super_ptr << _JsonValue)) return false;
31643164
}
3165-
if (_JsonValue.HasMember(GLTFTEXT("innerConeAngle")) && _JsonValue[GLTFTEXT("innerConeAngle")].IsFloat())
3165+
if (_JsonValue.HasMember(GLTFTEXT("innerConeAngle")) && _JsonValue[GLTFTEXT("innerConeAngle")].IsNumber())
31663166
{
31673167
_rData.innerConeAngle = _JsonValue[GLTFTEXT("innerConeAngle")].GetFloat();
31683168
}
3169-
if (_JsonValue.HasMember(GLTFTEXT("outerConeAngle")) && _JsonValue[GLTFTEXT("outerConeAngle")].IsFloat())
3169+
if (_JsonValue.HasMember(GLTFTEXT("outerConeAngle")) && _JsonValue[GLTFTEXT("outerConeAngle")].IsNumber())
31703170
{
31713171
_rData.outerConeAngle = _JsonValue[GLTFTEXT("outerConeAngle")].GetFloat();
31723172
}
@@ -3280,15 +3280,15 @@ namespace libgltf
32803280
SGlTFProperty& super_ptr = _rData;
32813281
if (!(super_ptr << _JsonValue)) return false;
32823282
}
3283-
if (_JsonValue.HasMember(GLTFTEXT("clearcoatFactor")) && _JsonValue[GLTFTEXT("clearcoatFactor")].IsFloat())
3283+
if (_JsonValue.HasMember(GLTFTEXT("clearcoatFactor")) && _JsonValue[GLTFTEXT("clearcoatFactor")].IsNumber())
32843284
{
32853285
_rData.clearcoatFactor = _JsonValue[GLTFTEXT("clearcoatFactor")].GetFloat();
32863286
}
32873287
if (_JsonValue.HasMember(GLTFTEXT("clearcoatTexture")) && _JsonValue[GLTFTEXT("clearcoatTexture")].IsObject())
32883288
{
32893289
if (!(_rData.clearcoatTexture << _JsonValue[GLTFTEXT("clearcoatTexture")])) return false;
32903290
}
3291-
if (_JsonValue.HasMember(GLTFTEXT("clearcoatRoughnessFactor")) && _JsonValue[GLTFTEXT("clearcoatRoughnessFactor")].IsFloat())
3291+
if (_JsonValue.HasMember(GLTFTEXT("clearcoatRoughnessFactor")) && _JsonValue[GLTFTEXT("clearcoatRoughnessFactor")].IsNumber())
32923292
{
32933293
_rData.clearcoatRoughnessFactor = _JsonValue[GLTFTEXT("clearcoatRoughnessFactor")].GetFloat();
32943294
}
@@ -3385,7 +3385,7 @@ namespace libgltf
33853385
{
33863386
if (!(_rData.specularFactor << _JsonValue[GLTFTEXT("specularFactor")])) return false;
33873387
}
3388-
if (_JsonValue.HasMember(GLTFTEXT("glossinessFactor")) && _JsonValue[GLTFTEXT("glossinessFactor")].IsFloat())
3388+
if (_JsonValue.HasMember(GLTFTEXT("glossinessFactor")) && _JsonValue[GLTFTEXT("glossinessFactor")].IsNumber())
33893389
{
33903390
_rData.glossinessFactor = _JsonValue[GLTFTEXT("glossinessFactor")].GetFloat();
33913391
}
@@ -4062,7 +4062,7 @@ namespace libgltf
40624062
{
40634063
if (!(_rData.offset << _JsonValue[GLTFTEXT("offset")])) return false;
40644064
}
4065-
if (_JsonValue.HasMember(GLTFTEXT("rotation")) && _JsonValue[GLTFTEXT("rotation")].IsFloat())
4065+
if (_JsonValue.HasMember(GLTFTEXT("rotation")) && _JsonValue[GLTFTEXT("rotation")].IsNumber())
40664066
{
40674067
_rData.rotation = _JsonValue[GLTFTEXT("rotation")].GetFloat();
40684068
}
@@ -4141,15 +4141,15 @@ namespace libgltf
41414141
SGlTFProperty& super_ptr = _rData;
41424142
if (!(super_ptr << _JsonValue)) return false;
41434143
}
4144-
if (_JsonValue.HasMember(GLTFTEXT("transmissionFactor")) && _JsonValue[GLTFTEXT("transmissionFactor")].IsFloat())
4144+
if (_JsonValue.HasMember(GLTFTEXT("transmissionFactor")) && _JsonValue[GLTFTEXT("transmissionFactor")].IsNumber())
41454145
{
41464146
_rData.transmissionFactor = _JsonValue[GLTFTEXT("transmissionFactor")].GetFloat();
41474147
}
41484148
if (_JsonValue.HasMember(GLTFTEXT("transmissionTexture")) && _JsonValue[GLTFTEXT("transmissionTexture")].IsObject())
41494149
{
41504150
if (!(_rData.transmissionTexture << _JsonValue[GLTFTEXT("transmissionTexture")])) return false;
41514151
}
4152-
if (_JsonValue.HasMember(GLTFTEXT("ior")) && _JsonValue[GLTFTEXT("ior")].IsFloat())
4152+
if (_JsonValue.HasMember(GLTFTEXT("ior")) && _JsonValue[GLTFTEXT("ior")].IsNumber())
41534153
{
41544154
_rData.ior = _JsonValue[GLTFTEXT("ior")].GetFloat();
41554155
}
@@ -4296,15 +4296,15 @@ namespace libgltf
42964296
{
42974297
_rData.type = _JsonValue[GLTFTEXT("type")].GetString();
42984298
}
4299-
if (_JsonValue.HasMember(GLTFTEXT("minimumValue")) && _JsonValue[GLTFTEXT("minimumValue")].IsFloat())
4299+
if (_JsonValue.HasMember(GLTFTEXT("minimumValue")) && _JsonValue[GLTFTEXT("minimumValue")].IsNumber())
43004300
{
43014301
_rData.minimumValue = _JsonValue[GLTFTEXT("minimumValue")].GetFloat();
43024302
}
4303-
if (_JsonValue.HasMember(GLTFTEXT("maximumValue")) && _JsonValue[GLTFTEXT("maximumValue")].IsFloat())
4303+
if (_JsonValue.HasMember(GLTFTEXT("maximumValue")) && _JsonValue[GLTFTEXT("maximumValue")].IsNumber())
43044304
{
43054305
_rData.maximumValue = _JsonValue[GLTFTEXT("maximumValue")].GetFloat();
43064306
}
4307-
if (_JsonValue.HasMember(GLTFTEXT("initialValue")) && _JsonValue[GLTFTEXT("initialValue")].IsFloat())
4307+
if (_JsonValue.HasMember(GLTFTEXT("initialValue")) && _JsonValue[GLTFTEXT("initialValue")].IsNumber())
43084308
{
43094309
_rData.initialValue = _JsonValue[GLTFTEXT("initialValue")].GetFloat();
43104310
}
@@ -4618,7 +4618,7 @@ namespace libgltf
46184618
{
46194619
_rData.name = _JsonValue[GLTFTEXT("name")].GetString();
46204620
}
4621-
if (_JsonValue.HasMember(GLTFTEXT("efficiency")) && _JsonValue[GLTFTEXT("efficiency")].IsFloat())
4621+
if (_JsonValue.HasMember(GLTFTEXT("efficiency")) && _JsonValue[GLTFTEXT("efficiency")].IsNumber())
46224622
{
46234623
_rData.efficiency = _JsonValue[GLTFTEXT("efficiency")].GetFloat();
46244624
}

‎tools/jsonschematoc11/c11types/c11typenumber.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def codeDefaultValueArray(cls, schemaDefaultValues):
3030

3131
@classmethod
3232
def codeJsonCheck(cls):
33-
return u'IsFloat()'
33+
return u'IsNumber()'
3434

3535
@classmethod
3636
def codeJsonSet(cls, dataName, variableName):

‎tools/jsonschematoc11/jsonschematoc11.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ def generate(self, codeFileName, outputHeaderPath=None, outputSourcePath=None, n
396396

397397
source_file.write(u'%sbool operator<<(float& _rData, const GLTFCharValue& _JsonValue)\n' % begin_space)
398398
source_file.write(u'%s{\n' % begin_space)
399-
source_file.write(u'%s if (_JsonValue.IsFloat())\n' % begin_space)
399+
source_file.write(u'%s if (_JsonValue.IsNumber())\n' % begin_space)
400400
source_file.write(u'%s {\n' % begin_space)
401401
source_file.write(u'%s _rData = _JsonValue.GetFloat();\n' % begin_space)
402402
source_file.write(u'%s return true;\n' % begin_space)

0 commit comments

Comments
 (0)