birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disambiguate setters and getters with the same name + updates to fix duplicates

Browse Source 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
This commit is contained in:
lsemp3d
2021-11-30 17:37:56 -08:00
parent 3ee528042f
commit 8ebfe4004e
7 changed files with 625 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names
+136 -2
View File
@@ -5,8 +5,7 @@
"context": "BehaviorClass",
"variant": "",
"details": {
"name": "Material Data",
"category": "Rendering"
"name": "Material Data"
},
"methods": [
{
@@ -433,9 +432,24 @@
},
{
"base": "GetNormal",
"context": "Getter",
"details": {
"name": "Get Normal"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Normal"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -447,9 +461,24 @@
},
{
"base": "GetDiffuse",
"context": "Getter",
"details": {
"name": "Get Diffuse"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Diffuse"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -461,9 +490,24 @@
},
{
"base": "GetSpecular",
"context": "Getter",
"details": {
"name": "Get Specular"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Specular"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -475,9 +519,24 @@
},
{
"base": "GetBump",
"context": "Getter",
"details": {
"name": "Get Bump"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Bump"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -489,9 +548,24 @@
},
{
"base": "GetEmissive",
"context": "Getter",
"details": {
"name": "Get Emissive"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Emissive"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -503,9 +577,24 @@
},
{
"base": "GetRoughness",
"context": "Getter",
"details": {
"name": "Get Roughness"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Roughness"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -517,9 +606,24 @@
},
{
"base": "GetBaseColor",
"context": "Getter",
"details": {
"name": "Get Base Color"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Base Color"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -531,9 +635,24 @@
},
{
"base": "GetAmbientOcclusion",
"context": "Getter",
"details": {
"name": "Get Ambient Occlusion"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Ambient Occlusion"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
@@ -545,9 +664,24 @@
},
{
"base": "GetMetallic",
"context": "Getter",
"details": {
"name": "Get Metallic"
},
"params": [
{
"typeid": "",
"details": {
"name": ""
}
},
{
"typeid": "",
"details": {
"name": "Metallic"
}
}
],
"results": [
{
"typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names
+445 -691
View File
File diff suppressed because it is too large Load Diff
Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names
+10 -17
View File
@@ -5,8 +5,7 @@
"context": "BehaviorClass",
"variant": "",
"details": {
"name": "Network Test Player Component Network Input",
"category": "Automated Testing"
"name": "Network Test Player Component Network Input"
},
"methods": [
{
@@ -27,13 +26,7 @@
{
"typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
"details": {
"name": "Forward Back"
}
},
{
"typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
"details": {
"name": "Left Right"
"name": "left Right"
}
}
],
@@ -47,9 +40,9 @@
]
},
{
"base": "FwdBack",
"base": "GetFwdBack",
"details": {
"name": "Get Forward Back"
"name": "Get Fwd Back"
},
"params": [
{
@@ -63,15 +56,15 @@
{
"typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
"details": {
"name": "Forward Back"
"name": "Fwd Back"
}
}
]
},
{
"base": "FwdBack",
"base": "SetFwdBack",
"details": {
"name": "Set Forward Back"
"name": "Set Fwd Back"
},
"params": [
{
@@ -83,13 +76,13 @@
{
"typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
"details": {
"name": "Forward Back"
"name": "Fwd Back"
}
}
]
},
{
"base": "LeftRight",
"base": "GetLeftRight",
"details": {
"name": "Get Left Right"
},
@@ -111,7 +104,7 @@
]
},
{
"base": "LeftRight",
"base": "SetLeftRight",
"details": {
"name": "Set Left Right"
},
Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names
+23 -9
View File
@@ -5,19 +5,32 @@
"context": "BehaviorClass",
"variant": "",
"details": {
"name": "ReferenceShapeConfig"
"name": "Reference Shape Config"
},
"methods": [
{
"base": "shapeEntityId",
"base": "GetshapeEntityId",
"context": "Getter",
"details": {
"name": "ReferenceShapeConfig::shapeEntityId::Getter"
"name": "Getshape Entity Id"
},
"params": [
{
"typeid": "{3E49974D-2EE0-4AF9-92B9-229A22B515C3}",
"details": {
"name": "ReferenceShapeConfig*"
"name": "Vegetation Reference Shape"
}
},
{
"typeid": "",
"details": {
"name": "shape Entity Id"
}
},
{
"typeid": "",
"details": {
"name": ""
}
}
],
@@ -25,28 +38,29 @@
{
"typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
"details": {
"name": "EntityId&",
"name": "Entity Id",
"tooltip": "Entity Unique Id"
}
}
]
},
{
"base": "shapeEntityId",
"base": "SetshapeEntityId",
"context": "Setter",
"details": {
"name": "ReferenceShapeConfig::shapeEntityId::Setter"
"name": "Setshape Entity Id"
},
"params": [
{
"typeid": "{3E49974D-2EE0-4AF9-92B9-229A22B515C3}",
"details": {
"name": "ReferenceShapeConfig*"
"name": "Vegetation Reference Shape"
}
},
{
"typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
"details": {
"name": "const EntityId&",
"name": "shape Entity Id",
"tooltip": "Entity Unique Id"
}
}