History

set vec with one number

SamGondelman committed 8 years ago

Commit b3bdddb1 parent 589e88a2 files · +56 −6Browse files

Showing the changes to libraries/shared/src/RegisteredMetaTypes.cpp (1 of 2 files). Show all

Unified · Split

libraries/shared/src/RegisteredMetaTypes.cpp+9−3
@@ -88,7 +88,9 @@ QScriptValue vec2ToScriptValue(QScriptEngine* engine, const glm::vec2& vec2) { · 87 unmodified lines
88}88}
89 89
90void vec2FromScriptValue(const QScriptValue& object, glm::vec2& vec2) {90void vec2FromScriptValue(const QScriptValue& object, glm::vec2& vec2) {
91 if (object.isArray()) {91 if (object.isNumber()) {
92 vec2 = glm::vec2(object.toVariant().toFloat());
93 } else if (object.isArray()) {
92 QVariantList list = object.toVariant().toList();94 QVariantList list = object.toVariant().toList();
93 if (list.length() == 2) {95 if (list.length() == 2) {
94 vec2.x = list[0].toFloat();96 vec2.x = list[0].toFloat();
@@ -228,7 +230,9 @@ QScriptValue vec3ColorToScriptValue(QScriptEngine* engine, const glm::vec3& vec3 · 133 unmodified lines
228}230}
229 231
230void vec3FromScriptValue(const QScriptValue& object, glm::vec3& vec3) {232void vec3FromScriptValue(const QScriptValue& object, glm::vec3& vec3) {
231 if (object.isString()) {233 if (object.isNumber()) {
234 vec3 = glm::vec3(object.toVariant().toFloat());
235 } else if (object.isString()) {
232 QColor qColor(object.toString());236 QColor qColor(object.toString());
233 if (qColor.isValid()) {237 if (qColor.isValid()) {
234 vec3.x = qColor.red();238 vec3.x = qColor.red();
@@ -341,7 +345,9 @@ QScriptValue u8vec3ColorToScriptValue(QScriptEngine* engine, const glm::u8vec3& · 106 unmodified lines
341}345}
342 346
343void u8vec3FromScriptValue(const QScriptValue& object, glm::u8vec3& vec3) {347void u8vec3FromScriptValue(const QScriptValue& object, glm::u8vec3& vec3) {
344 if (object.isString()) {348 if (object.isNumber()) {
349 vec3 = glm::vec3(object.toVariant().toUInt());
350 } else if (object.isString()) {
345 QColor qColor(object.toString());351 QColor qColor(object.toString());
346 if (qColor.isValid()) {352 if (qColor.isValid()) {
347 vec3.x = (uint8_t)qColor.red();353 vec3.x = (uint8_t)qColor.red();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t