Merge branch 'master' of https://github.com/highfidelity/hifi into one

interface/resources/qml/hifi/commerce/checkout/Checkout.qml

@@ -787,7 +787,7 @@ Rectangle {
                     }
                     lightboxPopup.button2text = "CONFIRM";
                     lightboxPopup.button2method = function() {
-                        Commerce.replaceContentSet(root.itemHref);
+                        Commerce.replaceContentSet(root.itemHref, root.certificateId);
                         lightboxPopup.visible = false;
                         rezzedNotifContainer.visible = true;
                         rezzedNotifContainerTimer.start();

libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp

@@ -17,7 +17,6 @@ std::string GL41Backend::getBackendShaderHeader() const {
     static const std::string header(
         R"SHADER(#version 410 core
         #define GPU_GL410
-        #define PRECISIONQ
         #define BITFIELD int
         )SHADER");
     return header;

libraries/gpu-gl/src/gpu/gl45/GL45BackendShader.cpp

@@ -18,7 +18,6 @@ std::string GL45Backend::getBackendShaderHeader() const {
     static const std::string header(
         R"SHADER(#version 450 core
         #define GPU_GL450
-        #define PRECISIONQ
         #define BITFIELD int
         )SHADER"
 #ifdef GPU_SSBO_TRANSFORM_OBJECT

libraries/gpu-gles/src/gpu/gles/GLESBackendShader.cpp

@@ -17,10 +17,9 @@ std::string GLESBackend::getBackendShaderHeader() const {
     static const std::string header(
         R"SHADER(#version 310 es
         #extension GL_EXT_texture_buffer : enable
-        precision lowp float; // check precision 2
-        precision lowp samplerBuffer;
-        precision lowp sampler2DShadow;
-        #define PRECISIONQ highp
+        precision highp float;
+        precision highp samplerBuffer;
+        precision highp sampler2DShadow;
         #define BITFIELD highp int
         )SHADER");
     return header;

libraries/gpu/src/gpu/Format.h

@@ -50,47 +50,50 @@ enum Type : uint8_t {
 };
 // Array providing the size in bytes for a given scalar type
 static const int TYPE_SIZE[NUM_TYPES] = {
-    4,
-    4,
-    4,
-    2,
-    2,
-    2,
-    1,
-    1,
+    4, // FLOAT
+    4, // INT32
+    4, // UINT32
+    2, // HALF
+    2, // INT16
+    2, // UINT16
+    1, // INT8
+    1, // UINT8
 
     // normalized values
-    4,
-    4,
-    2,
-    2,
-    1,
-    1,
-    4,
+    4, // NINT32
+    4, // NUINT32
+    2, // NINT16 
+    2, // NUINT16
+    1, // NINT8
+    1, // NUINT8
+    1, // NUINT2
+    1, // NINT2_10_10_10
 
-    1
+    1, // COMPRESSED
 };
+
 // Array answering the question Does this type is integer or not 
 static const bool TYPE_IS_INTEGER[NUM_TYPES] = {
-    false,
-    true,
-    true,
-    false,
-    true,
-    true,
-    true,
-    true,
+    false, // FLOAT
+    true, // INT32
+    true, // UINT32
+    false, // HALF
+    true, // INT16
+    true, // UINT16
+    true, // INT8
+    true, // UINT8
 
     // Normalized values
-    false,
-    false,
-    false,
-    false,
-    false,
-    false,
-    false,
+    false, // NINT32
+    false, // NUINT32
+    false, // NINT16 
+    false, // NUINT16
+    false, // NINT8
+    false, // NUINT8
+    false, // NUINT2
+    false, // NINT2_10_10_10
 
-    false,
+    false, // COMPRESSED
 };
 
 // Dimension of an Element
@@ -367,9 +370,9 @@ public:
     static const Element PART_DRAWCALL;
     
  protected:
-    uint8 _semantic;
-    uint8 _dimension : 4;
-    uint8 _type : 4;
+    uint16 _semantic : 7;
+    uint16 _dimension : 4;
+    uint16 _type : 5;
 };
 
   

libraries/graphics/src/graphics/Light.slh

@@ -34,7 +34,7 @@ vec3 getLightIrradiance(Light l) { return lightIrradiance_getIrradiance(l.irradi
 // Light Ambient
 
 struct LightAmbient {
-    PRECISIONQ vec4 _ambient;
+    vec4 _ambient;
     SphericalHarmonics _ambientSphere;
     mat4 transform;
 };

libraries/graphics/src/graphics/LightIrradiance.shared.slh

@@ -14,9 +14,9 @@
 #define LightIrradianceConstRef LightIrradiance
 
 struct LightIrradiance {
-    PRECISIONQ vec4 colorIntensity;
+    vec4 colorIntensity;
     // falloffRadius, cutoffRadius, falloffSpot, spare
-    PRECISIONQ vec4 attenuation;
+    vec4 attenuation;
 };
 
 

libraries/graphics/src/graphics/LightVolume.shared.slh

@@ -16,8 +16,8 @@
 #define LightVolumeConstRef LightVolume
 
 struct LightVolume {
-    PRECISIONQ vec4 positionRadius;
-    PRECISIONQ vec4 directionSpotCos;
+    vec4 positionRadius;
+    vec4 directionSpotCos;
 };
 
 bool lightVolume_isPoint(LightVolume lv) { return bool(lv.directionSpotCos.w < 0.f); }

libraries/graphics/src/graphics/Material.slh

@@ -15,10 +15,10 @@
 // to what is provided by the uniform buffer, or the material key has the wrong bits
 
 struct Material {
-    PRECISIONQ vec4 _emissiveOpacity;
-    PRECISIONQ vec4 _albedoRoughness;
-    PRECISIONQ vec4 _fresnelMetallic;
-    PRECISIONQ vec4 _scatteringSpare2Key;
+    vec4 _emissiveOpacity;
+    vec4 _albedoRoughness;
+    vec4 _fresnelMetallic;
+    vec4 _scatteringSpare2Key;
 };
 
 uniform materialBuffer {
@@ -64,7 +64,4 @@ const BITFIELD OCCLUSION_MAP_BIT             = 0x00004000;
 const BITFIELD LIGHTMAP_MAP_BIT              = 0x00008000;
 const BITFIELD SCATTERING_MAP_BIT            = 0x00010000;
 
-#ifdef GL_ES
-precision lowp float;
-#endif
 <@endif@>

libraries/graphics/src/graphics/SphericalHarmonics.shared.slh

@@ -16,15 +16,15 @@
 #define SphericalHarmonicsConstRef SphericalHarmonics
 
 struct SphericalHarmonics {
-    PRECISIONQ vec4 L00;
-    PRECISIONQ vec4 L1m1;
-    PRECISIONQ vec4 L10;
-    PRECISIONQ vec4 L11;
-    PRECISIONQ vec4 L2m2;
-    PRECISIONQ vec4 L2m1;
-    PRECISIONQ vec4 L20;
-    PRECISIONQ vec4 L21;
-    PRECISIONQ vec4 L22;
+    vec4 L00;
+    vec4 L1m1;
+    vec4 L10;
+    vec4 L11;
+    vec4 L2m2;
+    vec4 L2m1;
+    vec4 L20;
+    vec4 L21;
+    vec4 L22;
 };
 
 vec4 sphericalHarmonics_evalSphericalLight(SphericalHarmonicsConstRef sh, vec3 direction) {

libraries/render-utils/src/LightingModel.slh

@@ -14,10 +14,10 @@
 <@func declareLightingModel()@>
 
 struct LightingModel {
-    PRECISIONQ vec4 _UnlitEmissiveLightmapBackground;
-    PRECISIONQ vec4 _ScatteringDiffuseSpecularAlbedo;
-    PRECISIONQ vec4 _AmbientDirectionalPointSpot;
-    PRECISIONQ vec4 _ShowContourObscuranceWireframe;
+    vec4 _UnlitEmissiveLightmapBackground;
+    vec4 _ScatteringDiffuseSpecularAlbedo;
+    vec4 _AmbientDirectionalPointSpot;
+    vec4 _ShowContourObscuranceWireframe;
 };
 
 uniform lightingModelBuffer{

libraries/script-engine/src/UsersScriptingInterface.h

@@ -106,10 +106,11 @@ public slots:
     void mute(const QUuid& nodeID);
 
     /**jsdoc
-    * Get the user name and machine fingerprint associated with the given UUID. This will only do anything if you're an admin 
-    * of the domain you're in.
-    * @function Users.getUsernameFromID
-    * @param {Uuid} nodeID The node or session ID of the user whose username you want.
+    * Request the user name and machine fingerprint associated with the given UUID. The user name will be returned in a 
+    * {@link Users.usernameFromIDReply|usernameFromIDReply} signal. This will only do anything if you're an admin of the domain 
+    * you're in.
+    * @function Users.requestUsernameFromID
+    * @param {Uuid} nodeID The node or session ID of the user whose user name you want.
     */
     void requestUsernameFromID(const QUuid& nodeID);
 
@@ -170,7 +171,8 @@ signals:
     void enteredIgnoreRadius();
 
     /**jsdoc
-     * Notifies scripts of the user name and machine fingerprint associated with a UUID.
+     * Triggered in response to a {@link Users.requestUsernameFromID|requestUsernameFromID} call. Provides the user name and 
+     * machine fingerprint associated with a UUID.
      * Username and machineFingerprint will be their default constructor output if the requesting user isn't an admin.
      * @function Users.usernameFromIDReply
      * @param {Uuid} nodeID