diff options
| author | Kaj Grönholm <kaj.gronholm@qt.io> | 2020-10-06 11:34:27 +0300 |
|---|---|---|
| committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2020-10-08 07:45:59 +0300 |
| commit | c86ab081ad603277c70476ca5a80540cfab69208 (patch) | |
| tree | aaef494bf402b7ce0b47064526da8491b5a24a80 | |
| parent | 4043a87ee65e9a2d01f56e8fd15a028fb30364bf (diff) | |
Improve attributes handling
Add some missing attributes and disable node OnSpecificPropertyChange
assert same way it is disabled for other objects.
Task-number: QT3DS-4180
Change-Id: I9966fb98129ed5c8455484e705f7f89a68a530b7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | src/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp | 2 | ||||
| -rw-r--r-- | src/runtime/Qt3DSAttributeHashes.cpp | 7 | ||||
| -rw-r--r-- | src/runtime/Qt3DSAttributeHashes.h | 7 | ||||
| -rw-r--r-- | src/runtime/Qt3DSAttributeHashes.txt | 8 |
4 files changed, 23 insertions, 1 deletions
diff --git a/src/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp b/src/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp index d4526e8..1167698 100644 --- a/src/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp +++ b/src/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp @@ -884,7 +884,7 @@ struct SNodeTranslator : public Qt3DSTranslator break; default: // Unknown attribute - QT3DS_ASSERT(false); + //QT3DS_ASSERT(false); break; } } diff --git a/src/runtime/Qt3DSAttributeHashes.cpp b/src/runtime/Qt3DSAttributeHashes.cpp index f126336..527bc31 100644 --- a/src/runtime/Qt3DSAttributeHashes.cpp +++ b/src/runtime/Qt3DSAttributeHashes.cpp @@ -292,6 +292,13 @@ const char *GetAttributeString(const EAttribute inAttribute) case ATTRIBUTE_OBSERVEDPROPERTY: return "observedproperty"; case ATTRIBUTE_ORDERED: return "ordered"; case ATTRIBUTE_CULLMODE: return "cullmode"; + case ATTRIBUTE_SHY: return "shy"; + case ATTRIBUTE_VARIANTS: return "variants"; + case ATTRIBUTE_IGNORESPARENT: return "ignoresparent"; + case ATTRIBUTE_BONEID: return "boneid"; + case ATTRIBUTE_IMPORTFILE: return "importfile"; + case ATTRIBUTE_POSEROOT: return "poseroot"; + case ATTRIBUTE_ALPHA: return "alpha"; case ATTRIBUTE_QT_IO: return "qt.io"; default: { static char s_UnknownHash[16]; diff --git a/src/runtime/Qt3DSAttributeHashes.h b/src/runtime/Qt3DSAttributeHashes.h index 8979ddb..c373d62 100644 --- a/src/runtime/Qt3DSAttributeHashes.h +++ b/src/runtime/Qt3DSAttributeHashes.h @@ -283,6 +283,13 @@ enum EAttribute { ATTRIBUTE_OBSERVEDPROPERTY = 0x02D1CE03, // observedproperty ATTRIBUTE_ORDERED = 0x038AEAD3, // ordered ATTRIBUTE_CULLMODE = 0x009C792B, // cullmode + ATTRIBUTE_SHY = 0x023F2FFC, // shy + ATTRIBUTE_VARIANTS = 0x02F3DA52, // variants + ATTRIBUTE_IGNORESPARENT = 0x00D43995, // ignoresparent + ATTRIBUTE_BONEID = 0x00871A01, // boneid + ATTRIBUTE_IMPORTFILE = 0x00D392FF, // importfile + ATTRIBUTE_POSEROOT = 0x038E5ACD, // poseroot + ATTRIBUTE_ALPHA = 0x011BA522, // alpha ATTRIBUTE_QT_IO = 0x010EF2CF, // qt.io }; // enum EAttribute diff --git a/src/runtime/Qt3DSAttributeHashes.txt b/src/runtime/Qt3DSAttributeHashes.txt index 3549132..567f737 100644 --- a/src/runtime/Qt3DSAttributeHashes.txt +++ b/src/runtime/Qt3DSAttributeHashes.txt @@ -257,3 +257,11 @@ observedproperty ordered cullmode + +shy +variants +ignoresparent +boneid +importfile +poseroot +alpha |