fix some warnings, disable outlines for now

libraries/graphics-scripting/src/graphics-scripting/Forward.h

@@ -52,55 +52,55 @@ namespace scriptable {
         ScriptableMaterial(const ScriptableMaterial& material) { *this = material; }
         ScriptableMaterial& operator=(const ScriptableMaterial& material);
 
-        QString name;
+        QString name { "" };
-        QString model;
+        QString model { "" };
-        float opacity;
+        float opacity { 0.0f };
-        float roughness;
+        float roughness { 0.0f };
-        float metallic;
+        float metallic { 0.0f };
-        float scattering;
+        float scattering { 0.0f };
-        bool unlit;
+        bool unlit { false };
-        glm::vec3 emissive;
+        glm::vec3 emissive { 0.0f };
-        glm::vec3 albedo;
+        glm::vec3 albedo { 0.0f };
-        QString emissiveMap;
+        QString emissiveMap { "" };
-        QString albedoMap;
+        QString albedoMap { "" };
-        QString opacityMap;
+        QString opacityMap { "" };
-        QString opacityMapMode;
+        QString opacityMapMode { "" };
-        float opacityCutoff;
+        float opacityCutoff { 0.0f };
-        QString metallicMap;
+        QString metallicMap { "" };
-        QString specularMap;
+        QString specularMap { "" };
-        QString roughnessMap;
+        QString roughnessMap { "" };
-        QString glossMap;
+        QString glossMap { "" };
-        QString normalMap;
+        QString normalMap { "" };
-        QString bumpMap;
+        QString bumpMap { "" };
-        QString occlusionMap;
+        QString occlusionMap { "" };
-        QString lightMap;
+        QString lightMap { "" };
-        QString scatteringMap;
+        QString scatteringMap { "" };
         std::array<glm::mat4, graphics::Material::NUM_TEXCOORD_TRANSFORMS> texCoordTransforms;
-        QString cullFaceMode;
+        QString cullFaceMode { "" };
-        bool defaultFallthrough;
+        bool defaultFallthrough { false };
         std::unordered_map<uint, bool> propertyFallthroughs; // not actually exposed to script
 
-        QString procedural;
+        QString procedural { "" };
 
-        glm::vec3 shade;
+        glm::vec3 shade { 0.0f };
-        QString shadeMap;
+        QString shadeMap { "" };
-        float shadingShift;
+        float shadingShift { 0.0f };
-        QString shadingShiftMap;
+        QString shadingShiftMap { "" };
-        float shadingToony;
+        float shadingToony { 0.0f };
-        glm::vec3 matcap;
+        glm::vec3 matcap { 0.0f };
-        QString matcapMap;
+        QString matcapMap { "" };
-        glm::vec3 parametricRim;
+        glm::vec3 parametricRim { 0.0f };
-        float parametricRimFresnelPower;
+        float parametricRimFresnelPower { 0.0f };
-        float parametricRimLift;
+        float parametricRimLift { 0.0f };
-        QString rimMap;
+        QString rimMap { "" };
-        float rimLightingMix;
+        float rimLightingMix { 0.0f };
-        QString outlineWidthMode;
+        QString outlineWidthMode { "" };
-        float outlineWidth;
+        float outlineWidth { 0.0f };
-        glm::vec3 outline;
+        glm::vec3 outline { 0.0f };
-        QString uvAnimationMaskMap;
+        QString uvAnimationMaskMap { "" };
-        float uvAnimationScrollXSpeed;
+        float uvAnimationScrollXSpeed { 0.0f };
-        float uvAnimationScrollYSpeed;
+        float uvAnimationScrollYSpeed { 0.0f };
-        float uvAnimationRotationSpeed;
+        float uvAnimationRotationSpeed { 0.0f };
 
         graphics::MaterialKey key { 0 };
     };

libraries/graphics/src/graphics/Material.cpp

@@ -72,8 +72,8 @@ Material::Material() {
 
 Material::Material(const Material& material) :
     _name(material._name),
-    _model(material._model),
     _key(material._key),
+    _model(material._model),
     _emissive(material._emissive),
     _opacity(material._opacity),
     _albedo(material._albedo),

libraries/procedural/src/procedural/ProceduralMaterialCache.cpp

@@ -725,7 +725,8 @@ std::pair<std::string, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource
                         } else {
                             NetworkMToonMaterial::OutlineWidthMode mode;
                             if (NetworkMToonMaterial::getOutlineWidthModeFromName(valueString.toStdString(), mode)) {
-                                toonMaterial->setOutlineWidthMode(mode);
+                                // FIXME: Outlines are currently disabled because they're buggy
+                                //toonMaterial->setOutlineWidthMode(mode);
                             }
                         }
                     }

libraries/render/src/render/HighlightStyle.h

@@ -69,9 +69,9 @@ namespace render {
                 glm::vec4 p2 = projection * (viewPos - glm::vec4(0.0f, 0.5f * outlineWidth, 0.0f, 0.0f));
                 p2 /= p2.w;
 
-                style._outlineWidth = 0.5 * screenHeight * fabs(p1.y - p2.y);
+                style._outlineWidth = floor(0.5f * (float)screenHeight * fabs(p1.y - p2.y));
             } else { // OUTLINE_SCREEN
-                style._outlineWidth = outlineWidth * screenHeight;
+                style._outlineWidth = floor(outlineWidth * (float)screenHeight);
             }
 
             return style;