Adding reflection of the ambient map for translucent

cmake/macros/GenerateInstallers.cmake

@@ -19,7 +19,7 @@ macro(GENERATE_INSTALLERS)
   set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME})
   set(CPACK_PACKAGE_VENDOR "High Fidelity")
   set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
-  set(CPACK_PACKAGE_FILE_NAME "HighFidelity-Alpha-${BUILD_VERSION}")
+  set(CPACK_PACKAGE_FILE_NAME "HighFidelity-Beta-${BUILD_VERSION}")
   set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
   set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
   set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME})

examples/clap.js

@@ -1,148 +0,0 @@
-//
-//  clap.js
-//  examples
-//
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  This sample script watches your hydra hands and makes clapping sound when they come close together fast, 
-//  and also watches for the 'shift' key and claps when that key is pressed.  Clapping multiple times by pressing 
-//  the shift key again makes the animation and sound match your pace of clapping. 
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
-
-var clapAnimation = HIFI_PUBLIC_BUCKET + "animations/ClapAnimations/ClapHands_Standing.fbx";
-var ANIMATION_FRAMES_PER_CLAP = 10.0;
-var startEndFrames = [];
-startEndFrames.push({ start: 0, end: 10});
-startEndFrames.push({ start: 10, end: 20});
-startEndFrames.push({ start: 20, end: 30});
-startEndFrames.push({ start: 30, end: 40});
-startEndFrames.push({ start: 41, end: 51});
-startEndFrames.push({ start: 53, end: 0});
-
-var lastClapFrame = 0;
-var lastAnimFrame = 0;
-
-var claps = [];
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap1Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap2Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap3Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap4Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap5Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap6Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap7Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap8Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap9Rvb.wav"));
-claps.push(SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap10Rvb.wav"));
-var numberOfSounds = claps.length;
-
-var clappingNow = false;
-var collectedClicks = 0;
-
-var clickStartTime, clickEndTime;
-var clickClappingNow = false; 
-var CLAP_START_RATE = 15.0;
-var clapRate = CLAP_START_RATE; 
-var startedTimer = false; 
-
-function maybePlaySound(deltaTime) {
-    //  Set the location and other info for the sound to play
-
-    var animationDetails = MyAvatar.getAnimationDetails(clapAnimation);
-
-    var frame = Math.floor(animationDetails.frameIndex);
-
-    if (frame != lastAnimFrame) {
-        lastAnimFrame = frame;
-    }
-
-    for (var i = 0; i < startEndFrames.length; i++) {
-        if (frame == startEndFrames[i].start && (frame != lastClapFrame)) {
-            playClap(1.0, Camera.getPosition());
-            lastClapFrame = frame; 
-        }
-    }
-
-    var palm1Position = MyAvatar.getLeftPalmPosition();
-    var palm2Position = MyAvatar.getRightPalmPosition();
-    var distanceBetween = Vec3.length(Vec3.subtract(palm1Position, palm2Position));
-
-    var palm1Velocity = Controller.getPoseValue(Controller.Standard.LeftHand).velocity;
-    var palm2Velocity = Controller.getPoseValue(Controller.Standard.RightHand).velocity;
-    var closingVelocity = Vec3.length(Vec3.subtract(palm1Velocity, palm2Velocity));
-
-    const CLAP_SPEED = 0.7;
-    const CLAP_DISTANCE = 0.15; 
-
-    if ((closingVelocity > CLAP_SPEED) && (distanceBetween < CLAP_DISTANCE) && !clappingNow) {
-        var volume = closingVelocity / 2.0;
-        if (volume > 1.0) volume = 1.0;
-        playClap(volume, palm1Position);
-        clappingNow = true; 
-    } else if (clappingNow && (distanceBetween > CLAP_DISTANCE * 1.2)) {
-        clappingNow = false;
-    }
-}
-
-function playClap(volume, position) {
-    var clip = Math.floor(Math.random() * numberOfSounds);
-    Audio.playSound(claps[clip], {
-      position: position,
-    volume: volume
-    });
-}
-
-var FASTEST_CLAP_INTERVAL = 150.0;
-var SLOWEST_CLAP_INTERVAL = 750.0;
-
-Controller.keyPressEvent.connect(function(event) {
-    if(event.text == "SHIFT") {
-        if (!clickClappingNow) {
-            clickClappingNow = true;
-            clickStartTime = new Date();
-            lastClapFrame = 0;
-        } else {
-            //  start or adjust clapping speed based on the duration between clicks
-            clickEndTime = new Date();
-            var milliseconds = Math.max(clickEndTime - clickStartTime, FASTEST_CLAP_INTERVAL);
-            clickStartTime = new Date();
-            if (milliseconds < SLOWEST_CLAP_INTERVAL) {
-                clapRate = ANIMATION_FRAMES_PER_CLAP * (1000.0 / milliseconds);
-                playClap(1.0, Camera.getPosition());
-                MyAvatar.stopAnimation(clapAnimation);
-                MyAvatar.startAnimation(clapAnimation, clapRate, 1.0, true, false);
-            }
-            collectedClicks = collectedClicks + 1;
-        }
-    }
-});
-
-var CLAP_END_WAIT_MSECS = 300;
-Controller.keyReleaseEvent.connect(function(event) {
-    if (event.text == "SHIFT") {
-        collectedClicks = 0;
-        if (!startedTimer) {
-            collectedClicks = 0;
-            Script.setTimeout(stopClapping, CLAP_END_WAIT_MSECS);
-            startedTimer = true;
-        }
-    }
-});
-
-function stopClapping() {
-    if (collectedClicks == 0) {
-        startedTimer = false;
-           MyAvatar.stopAnimation(clapAnimation);
-           clapRate = CLAP_START_RATE;
-           clickClappingNow = false;
-    }  else {
-        startedTimer = false;
-    } 
-}
-
-// Connect a call back that happens every frame
-Script.update.connect(maybePlaySound);

examples/cows/cowEntityScript.js

@@ -1,68 +0,0 @@
-
-//  cowEntityScript.js
-//  examples/cows
-//
-//  Created by Eric Levin on 3/25/16
-//  Copyright 2016 High Fidelity, Inc.
-//
-// This entity script handles the logic for untipping a cow after it collides with something
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-
-
-(function() {
-    Script.include("../libraries/utils.js");
-
-    var _this = this;
-    _this.COLLISION_COOLDOWN_TIME = 5000;
-
-
-    this.preload = function(entityID) {
-        print("EBL Preload!!");
-        _this.entityID = entityID;
-        _this.mooSound = SoundCache.getSound("https://s3-us-west-1.amazonaws.com/hifi-content/eric/Sounds/moo.wav")
-        _this.mooSoundOptions = {volume: 0.7, loop: false};
-        _this.timeSinceLastCollision = 0;
-        _this.shouldUntipCow = true;
-    }
-
-    this.collisionWithEntity = function(myID, otherID, collisionInfo) {
-        if(_this.shouldUntipCow) {
-          Script.setTimeout(function() {
-             _this.untipCow();  
-            _this.shouldUntipCow = true;
-          }, _this.COLLISION_COOLDOWN_TIME);
-        } 
-
-        _this.shouldUntipCow = false;
-        
-    }
-
-    this.untipCow = function() {
-        // keep yaw but reset pitch and roll
-        var cowProps = Entities.getEntityProperties(_this.entityID, ["rotation", "position"]);
-        var eulerRotation = Quat.safeEulerAngles(cowProps.rotation);
-        eulerRotation.x = 0;
-        eulerRotation.z = 0;
-        var newRotation = Quat.fromVec3Degrees(eulerRotation);
-        Entities.editEntity(_this.entityID, {
-            rotation: newRotation,
-            velocity: {x: 0, y: 0, z: 0},
-            angularVelocity: {x: 0, y: 0, z:0}
-        });
-
-
-        _this.mooSoundOptions.position = cowProps.position;
-        if (!_this.soundInjector) {
-            _this.soundInjector = Audio.playSound(_this.mooSound, _this.mooSoundOptions);
-        } else {
-            _this.soundInjector.setOptions(_this.mooSoundOptions);
-            _this.soundInjector.restart();
-        }
-    }
-
-
-});

examples/cows/cowSpawner.js

@@ -1,53 +0,0 @@
-
-//  cowSpawner.js
-//  examples/cows
-//
-//  Created by Eric Levin on 3/25/16
-//  Copyright 2016 High Fidelity, Inc.
-//
-// This spawns a cow which will untip itself
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-  var orientation = MyAvatar.orientation;
-  orientation = Quat.safeEulerAngles(orientation);
-  orientation.x = 0;
-  orientation = Quat.fromVec3Degrees(orientation);
-  var center = Vec3.sum(MyAvatar.getHeadPosition(), Vec3.multiply(2, Quat.getFront(orientation)));
-
-
-  var SCRIPT_URL = Script.resolvePath("cowEntityScript.js?");
-  var cow = Entities.addEntity({
-      type: "Model",
-      modelURL: "http://hifi-content.s3.amazonaws.com/DomainContent/production/cow/newMooCow.fbx",
-      name: "playa_model_throwinCow",
-      position: center,
-      animation: {
-          currentFrame: 278,
-          running: true,
-          url: "http://hifi-content.s3.amazonaws.com/DomainContent/Junkyard/Playa/newMooCow.fbx"
-      },
-      dimensions: {
-          x: 0.739,
-          y: 1.613,
-          z: 2.529
-      },
-      dynamic: true,
-      gravity: {
-          x: 0,
-          y: -5,
-          z: 0
-      },
-      shapeType: "box",
-      script: SCRIPT_URL,
-      userData: "{\"grabbableKey\":{\"grabbable\":true}}"
-  });
-
-
-  function cleanup() {
-      Entities.deleteEntity(cow);
-  }
-
-  Script.scriptEnding.connect(cleanup);

examples/defaultScripts.js

@@ -1,22 +0,0 @@
-//
-//  defaultScripts.js
-//  examples
-//
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-Script.load("away.js");
-Script.load("progress.js");
-Script.load("edit.js");
-Script.load("examples.js");
-Script.load("selectAudioDevice.js");
-Script.load("notifications.js");
-Script.load("controllers/handControllerGrab.js");
-Script.load("controllers/squeezeHands.js");
-Script.load("grab.js");
-Script.load("directory.js");
-Script.load("dialTone.js");
-Script.load("depthReticle.js");

examples/example/games/exterminatorGame/pistol.js

@@ -1,477 +0,0 @@
-//
-//  pistol.js
-//  examples
-//
-//  Created by Eric Levin on 11/12/2015
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  This is an example script that turns the hydra controllers and mouse into a entity gun.
-//  It reads the controller, watches for trigger pulls, and adds a force to any entity it hits
-
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-
-Script.include("../../../libraries/utils.js");
-Script.include("../../../libraries/constants.js");
-
-var GUN_FORCE =20;
-
-Messages.sendMessage('Hifi-Hand-Disabler', "both");
-
-var gameName = "Kill All The Rats!"
-// var HOST = "localhost:5000"
-var HOST = "desolate-bastion-1742.herokuapp.com";
-var socketClient = new WebSocket("ws://" + HOST);
-var username = GlobalServices.username;
-var currentScore = 0;
-
-function score() {
-    currentScore++;
-    socketClient.send(JSON.stringify({
-        username: username,
-        score: currentScore,
-        gameName: gameName
-    }))
-}
-
-
-HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
-var fireSound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/Guns/GUN-SHOT2.raw");
-var LASER_LENGTH = 100;
-var LASER_WIDTH = 2;
-var POSE_CONTROLS = [Controller.Standard.LeftHand, Controller.Standard.RightHand];
-var TRIGGER_CONTROLS = [Controller.Standard.LT, Controller.Standard.RT];
-var MIN_THROWER_DELAY = 1000;
-var MAX_THROWER_DELAY = 1000;
-var RELOAD_INTERVAL = 5;
-var GUN_MODEL = HIFI_PUBLIC_BUCKET + "cozza13/gun/m1911-handgun+1.fbx?v=4";
-var BULLET_VELOCITY = 10.0;
-var GUN_OFFSETS = [{
-    x: 0.04,
-    y: 0.26,
-    z: 0.04
-}, {
-    x: 0.04,
-    y: 0.26,
-    z: 0.04
-}];
-
-var GUN_ORIENTATIONS = [Quat.fromPitchYawRollDegrees(0, 90, 90), Quat.fromPitchYawRollDegrees(0, -90, 270)];
-
-//x -> y
-//y -> z
-// z -> x
-var BARREL_OFFSETS = [ {
-    x: -0.12,
-    y: 0.12,
-    z: 0.04
-}, {
-    x: 0.12,
-    y: 0.12,
-    z: 0.04
-} ];
-
-
-
-var pointers = [];
-
-pointers.push(Overlays.addOverlay("line3d", {
-    start: ZERO_VECTOR,
-    end: ZERO_VECTOR,
-    color: COLORS.RED,
-    alpha: 1,
-    visible: true,
-    lineWidth: LASER_WIDTH
-}));
-
-pointers.push(Overlays.addOverlay("line3d", {
-    start: ZERO_VECTOR,
-    end: ZERO_VECTOR,
-    color: COLORS.RED,
-    alpha: 1,
-    visible: true,
-    lineWidth: LASER_WIDTH
-}));
-
-var mapping = Controller.newMapping();
-var validPoses = [false, false];
-var barrelVectors = [0, 0];
-var barrelTips = [0, 0];
-
-
-// If enabled, anything can be shot, otherwise, an entity needs to have "isShootable" set in its userData
-var shootAnything = true;
-
-
-function update(deltaTime) {
-    // FIXME we should also expose MyAvatar.handPoses[2], MyAvatar.tipPoses[2]
-    var tipPoses = [MyAvatar.leftHandTipPose, MyAvatar.rightHandTipPose];
-
-    for (var side = 0; side < 2; side++) {
-        // First check if the controller is valid
-        var controllerPose = Controller.getPoseValue(POSE_CONTROLS[side]);
-        validPoses[side] = controllerPose.valid;
-        // Need to adjust the laser
-        var tipPose = tipPoses[side];
-        var handRotation = tipPoses[side].rotation;
-        var barrelOffset = Vec3.multiplyQbyV(handRotation, BARREL_OFFSETS[side]);
-        barrelTips[side] = Vec3.sum(tipPose.translation, barrelOffset);
-        barrelVectors[side] = Vec3.multiplyQbyV(handRotation, {
-            x: 0,
-            y: 1,
-            z: 0
-        });
-
-        var laserTip = Vec3.sum(Vec3.multiply(LASER_LENGTH, barrelVectors[side]), barrelTips[side]);
-        // Update Lasers
-        Overlays.editOverlay(pointers[side], {
-            start: barrelTips[side],
-            end: laserTip,
-            alpha: 1,
-        });
-
-    }
-}
-
-
-
-function displayPointer(side) {
-    Overlays.editOverlay(pointers[side], {
-        visible: true
-    });
-}
-
-function hidePointer(side) {
-    Overlays.editOverlay(pointers[side], {
-        visible: false
-    });
-}
-
-function fire(side, value) {
-    if (value == 0) {
-        return;
-    }
-    Audio.playSound(fireSound, {
-        position: barrelTips[side],
-        volume: 0.5
-    });
-
-    var shotDirection = Vec3.normalize(barrelVectors[side]);
-    var pickRay = {
-        origin: barrelTips[side],
-        direction: shotDirection
-    };
-    createMuzzleFlash(barrelTips[side]);
-
-    var intersection = Entities.findRayIntersectionBlocking(pickRay, true);
-    if (intersection.intersects) {
-        Script.setTimeout(function() {
-            createEntityHitEffect(intersection.intersection);
-            if (shootAnything && intersection.properties.dynamic === 1) {
-                // Any dynamic entity can be shot
-                Entities.editEntity(intersection.entityID, {
-                    velocity: Vec3.multiply(shotDirection, GUN_FORCE)
-                });
-            }
-
-            if (intersection.properties.name === "rat") {
-                score();
-                createBloodSplatter(intersection.intersection);
-                Entities.deleteEntity(intersection.entityID);
-
-            }
-            //Attempt to call entity method's shot method
-            var forceDirection = JSON.stringify({
-                forceDirection: shotDirection
-            });
-            Entities.callEntityMethod(intersection.entityID, 'onShot', [forceDirection]);
-
-        }, 0);
-
-    }
-}
-
-
-function scriptEnding() {
-    Messages.sendMessage('Hifi-Hand-Disabler', 'none');
-    mapping.disable();
-    for (var i = 0; i < pointers.length; ++i) {
-        Overlays.deleteOverlay(pointers[i]);
-    }
-    MyAvatar.detachOne(GUN_MODEL);
-    MyAvatar.detachOne(GUN_MODEL);
-    clearPose();
-}
-
-MyAvatar.attach(GUN_MODEL, "LeftHand", GUN_OFFSETS[0], GUN_ORIENTATIONS[0], 0.40);
-MyAvatar.attach(GUN_MODEL, "RightHand", GUN_OFFSETS[1], GUN_ORIENTATIONS[1], 0.40);
-
-function showPointer(side) {
-    Overlays.editOverlay(pointers[side], {
-        visible: true
-    });
-}
-
-
-
-mapping.from(Controller.Standard.LT).hysteresis(0.0, 0.5).to(function(value) {
-    fire(0, value);
-});
-
-
-mapping.from(Controller.Standard.RT).hysteresis(0.0, 0.5).to(function(value) {
-    fire(1, value);
-});
-mapping.enable();
-
-Script.scriptEnding.connect(scriptEnding);
-Script.update.connect(update);
-
-
-function createEntityHitEffect(position) {
-    var flash = Entities.addEntity({
-        type: "ParticleEffect",
-        position: position,
-        lifetime: 4,
-        "name": "Flash Emitter",
-        "color": {
-            red: 228,
-            green: 128,
-            blue: 12
-        },
-        "maxParticles": 1000,
-        "lifespan": 0.15,
-        "emitRate": 1000,
-        "emitSpeed": 1,
-        "speedSpread": 0,
-        "emitOrientation": {
-            "x": -0.4,
-            "y": 1,
-            "z": -0.2,
-            "w": 0.7071068286895752
-        },
-        "emitDimensions": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "polarStart": 0,
-        "polarFinish": Math.PI,
-        "azimuthStart": -3.1415927410125732,
-        "azimuthFinish": 2,
-        "emitAcceleration": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "accelerationSpread": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "particleRadius": 0.03,
-        "radiusSpread": 0.02,
-        "radiusStart": 0.02,
-        "radiusFinish": 0.03,
-        "colorSpread": {
-            red: 100,
-            green: 100,
-            blue: 20
-        },
-        "alpha": 1,
-        "alphaSpread": 0,
-        "alphaStart": 0,
-        "alphaFinish": 0,
-        "additiveBlending": true,
-        "textures": "http://ericrius1.github.io/PartiArt/assets/star.png"
-    });
-
-    Script.setTimeout(function() {
-        Entities.editEntity(flash, {
-            isEmitting: false
-        });
-    }, 100);
-
-}
-
-
-function createBloodSplatter(position) {
-        var splatter = Entities.addEntity({
-        type: "ParticleEffect",
-        position: position,
-        lifetime: 4,
-        "name": "Blood Splatter",
-        "color": {
-            red: 230,
-            green: 2,
-            blue: 30
-        },
-        "maxParticles": 1000,
-        "lifespan": 0.3,
-        "emitRate": 1000,
-        "emitSpeed": 0.5,
-        "speedSpread": 0,
-        "emitOrientation": {
-            "x": -0.4,
-            "y": 1,
-            "z": -0.2,
-            "w": 0.7071068286895752
-        },
-        "emitDimensions": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "polarStart": 0,
-        "polarFinish": Math.PI,
-        "azimuthStart": -3.1415927410125732,
-        "azimuthFinish": 2,
-        "emitAcceleration": {
-            "x": 0,
-            "y": -5,
-            "z": 0
-        },
-        "accelerationSpread": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "particleRadius": 0.05,
-        "radiusSpread": 0.03,
-        "radiusStart": 0.05,
-        "radiusFinish": 0.05,
-        "colorSpread": {
-            red: 40,
-            green: 0,
-            blue: 30
-        },
-        "alpha": 1,
-        "alphaSpread": 0,
-        "alphaStart": 0,
-        "alphaFinish": 0,
-        "textures": "http://ericrius1.github.io/PartiArt/assets/star.png"
-    });
-
-    Script.setTimeout(function() {
-        Entities.editEntity(splatter, {
-            isEmitting: false
-        });
-    }, 100)
-
-}
-
-
-function createMuzzleFlash(position) {
-    var smoke = Entities.addEntity({
-        type: "ParticleEffect",
-        position: position,
-        lifetime: 1,
-        "name": "Smoke Hit Emitter",
-        "maxParticles": 1000,
-        "lifespan": 4,
-        "emitRate": 20,
-        emitSpeed: 0,
-        "speedSpread": 0,
-        "emitDimensions": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "polarStart": 0,
-        "polarFinish": 0,
-        "azimuthStart": -3.1415927410125732,
-        "azimuthFinish": 3.14,
-        "emitAcceleration": {
-            "x": 0,
-            "y": 0.5,
-            "z": 0
-        },
-        "accelerationSpread": {
-            "x": .2,
-            "y": 0,
-            "z": .2
-        },
-        "radiusSpread": .04,
-        "particleRadius": 0.07,
-        "radiusStart": 0.07,
-        "radiusFinish": 0.07,
-        "alpha": 0.7,
-        "alphaSpread": 0,
-        "alphaStart": 0,
-        "alphaFinish": 0,
-        "additiveBlending": 0,
-        "textures": "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png"
-    });
-    Script.setTimeout(function() {
-        Entities.editEntity(smoke, {
-            isEmitting: false
-        });
-    }, 100);
-
-    var flash = Entities.addEntity({
-        type: "ParticleEffect",
-        position: position,
-        lifetime: 4,
-        "name": "Muzzle Flash",
-        "color": {
-            red: 228,
-            green: 128,
-            blue: 12
-        },
-        "maxParticles": 1000,
-        "lifespan": 0.1,
-        "emitRate": 1000,
-        "emitSpeed": 0.5,
-        "speedSpread": 0,
-        "emitOrientation": {
-            "x": -0.4,
-            "y": 1,
-            "z": -0.2,
-            "w": 0.7071068286895752
-        },
-        "emitDimensions": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "polarStart": 0,
-        "polarFinish": Math.PI,
-        "azimuthStart": -3.1415927410125732,
-        "azimuthFinish": 2,
-        "emitAcceleration": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "accelerationSpread": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "particleRadius": 0.05,
-        "radiusSpread": 0.01,
-        "radiusStart": 0.05,
-        "radiusFinish": 0.05,
-        "colorSpread": {
-            red: 100,
-            green: 100,
-            blue: 20
-        },
-        "alpha": 1,
-        "alphaSpread": 0,
-        "alphaStart": 0,
-        "alphaFinish": 0,
-        "additiveBlending": true,
-        "textures": "http://ericrius1.github.io/PartiArt/assets/star.png"
-    });
-
-    Script.setTimeout(function() {
-        Entities.editEntity(flash, {
-            isEmitting: false
-        });
-    }, 100)
-
-
-}

examples/example/games/exterminatorGame/pistolScriptSpawner.js

@@ -1,37 +0,0 @@
-//
-//  Rat.js
-//  examples/toybox/entityScripts
-//
-//  Created by Eric Levin on11/11/15.
-//  Copyright 2015 High Fidelity, Inc.
-//
-
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt */
-
-
-(function() {
-    var scriptURL = Script.resolvePath('pistol.js');
-    var _this;
-    PistolScriptSpawner = function() {
-        _this = this;
-        this.forceMultiplier = 1;
-    };
-
-    PistolScriptSpawner.prototype = {
-
-        enterEntity: function() {
-      
-            Script.load(scriptURL);
-        },
-
-        preload: function(entityID) {
-            this.entityID = entityID;
-        },
-
-    };
-
-    // entity scripts always need to return a newly constructed object of our type
-    return new PistolScriptSpawner();
-});

interface/CMakeLists.txt

@@ -243,7 +243,7 @@ else (APPLE)
     "${PROJECT_SOURCE_DIR}/resources"
     $<TARGET_FILE_DIR:${TARGET_NAME}>/resources
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
-    "${CMAKE_SOURCE_DIR}/examples"
+    "${CMAKE_SOURCE_DIR}/scripts"
     $<TARGET_FILE_DIR:${TARGET_NAME}>/scripts
   )
 
@@ -269,7 +269,7 @@ endif (APPLE)
 if (SCRIPTS_INSTALL_DIR)
   # setup install of scripts beside interface executable
   install(
-    DIRECTORY "${CMAKE_SOURCE_DIR}/examples/"
+    DIRECTORY "${CMAKE_SOURCE_DIR}/scripts/"
     DESTINATION ${SCRIPTS_INSTALL_DIR}/scripts
     COMPONENT ${CLIENT_COMPONENT}
   )

interface/src/avatar/MyAvatar.cpp

@@ -916,7 +916,8 @@ void MyAvatar::updateLookAtTargetAvatar() {
         avatar->setIsLookAtTarget(false);
         if (!avatar->isMyAvatar() && avatar->isInitialized() &&
             (distanceTo < GREATEST_LOOKING_AT_DISTANCE * getUniformScale())) {
-            float angleTo = glm::angle(lookForward, glm::normalize(avatar->getHead()->getEyePosition() - getHead()->getEyePosition()));
+            float radius = glm::length(avatar->getHead()->getEyePosition() - avatar->getHead()->getRightEyePosition());
+            float angleTo = coneSphereAngle(getHead()->getEyePosition(), lookForward, avatar->getHead()->getEyePosition(), radius);
             if (angleTo < (smallestAngleTo * (isCurrentTarget ? KEEP_LOOKING_AT_CURRENT_ANGLE_FACTOR : 1.0f))) {
                 _lookAtTargetAvatar = avatarPointer;
                 _targetAvatarPosition = avatarPointer->getPosition();

libraries/entities-renderer/src/RenderableModelEntityItem.cpp

@@ -518,6 +518,7 @@ void RenderableModelEntityItem::update(const quint64& now) {
     if (!_dimensionsInitialized && _model && _model->isActive()) {
         if (_model->isLoaded()) {
             EntityItemProperties properties;
+            properties.setLastEdited(usecTimestampNow()); // we must set the edit time since we're editing it
             auto extents = _model->getMeshExtents();
             properties.setDimensions(extents.maximum - extents.minimum);
             qCDebug(entitiesrenderer) << "Autoresizing:" << (!getName().isEmpty() ? getName() : getModelURL());

libraries/model/src/model/Material.cpp

@@ -18,13 +18,15 @@ using namespace gpu;
 Material::Material() :
     _key(0),
     _schemaBuffer(),
+    _texMapArrayBuffer(),
     _textureMaps()
 {
     // created from nothing: create the Buffer to store the properties
     Schema schema;
     _schemaBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Schema), (const gpu::Byte*) &schema));
-        
 
+    TexMapArraySchema TexMapArraySchema;
+    _texMapArrayBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(TexMapArraySchema), (const gpu::Byte*) &TexMapArraySchema));
 }
 
 Material::Material(const Material& material) :
@@ -35,6 +37,10 @@ Material::Material(const Material& material) :
     Schema schema;
     _schemaBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Schema), (const gpu::Byte*) &schema));
     _schemaBuffer.edit<Schema>() = material._schemaBuffer.get<Schema>();
+
+    TexMapArraySchema texMapArraySchema;
+    _texMapArrayBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(TexMapArraySchema), (const gpu::Byte*) &texMapArraySchema));
+    _texMapArrayBuffer.edit<TexMapArraySchema>() = material._texMapArrayBuffer.get<TexMapArraySchema>();
 }
 
 Material& Material::operator= (const Material& material) {
@@ -46,6 +52,10 @@ Material& Material::operator= (const Material& material) {
     _schemaBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Schema), (const gpu::Byte*) &schema));
     _schemaBuffer.edit<Schema>() = material._schemaBuffer.get<Schema>();
 
+    TexMapArraySchema texMapArraySchema;
+    _texMapArrayBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(TexMapArraySchema), (const gpu::Byte*) &texMapArraySchema));
+    _texMapArrayBuffer.edit<TexMapArraySchema>() = material._texMapArrayBuffer.get<TexMapArraySchema>();
+
     return (*this);
 }
 
@@ -101,6 +111,15 @@ void Material::setTextureMap(MapChannel channel, const TextureMapPointer& textur
 
     if (channel == MaterialKey::ALBEDO_MAP) {
         resetOpacityMap();
+
+        // update the texcoord0 with albedo
+        _texMapArrayBuffer.edit<TexMapArraySchema>()._texcoordTransforms[0] = (textureMap ? textureMap->getTextureTransform().getMatrix() : glm::mat4());
+    }
+
+    if (channel == MaterialKey::LIGHTMAP_MAP) {
+        // update the texcoord1 with lightmap
+        _texMapArrayBuffer.edit<TexMapArraySchema>()._texcoordTransforms[1] = (textureMap ? textureMap->getTextureTransform().getMatrix() : glm::mat4());
+        _texMapArrayBuffer.edit<TexMapArraySchema>()._lightmapParams = (textureMap ? glm::vec4(textureMap->getLightmapOffsetScale(), 0.0, 0.0) : glm::vec4(0.0, 1.0, 0.0, 0.0));
     }
 
     _schemaBuffer.edit<Schema>()._key = (uint32)_key._flags.to_ulong();

libraries/model/src/model/Material.h

@@ -298,9 +298,21 @@ public:
     // conversion from legacy material properties to PBR equivalent
     static float shininessToRoughness(float shininess) { return 1.0f - shininess / 100.0f; }
 
+    // Texture Map Array Schema
+    static const int NUM_TEXCOORD_TRANSFORMS{ 2 };
+    class TexMapArraySchema {
+    public:
+        glm::mat4 _texcoordTransforms[NUM_TEXCOORD_TRANSFORMS];
+        glm::vec4 _lightmapParams{ 0.0, 1.0, 0.0, 0.0 };
+        TexMapArraySchema() {}
+    };
+
+    const UniformBufferView& getTexMapArrayBuffer() const { return _texMapArrayBuffer; }
 private:
     mutable MaterialKey _key;
     mutable UniformBufferView _schemaBuffer;
+    mutable UniformBufferView _texMapArrayBuffer;
+
     TextureMaps _textureMaps;
 };
 typedef std::shared_ptr< Material > MaterialPointer;

libraries/render-utils/src/DeferredGlobalLight.slh

@@ -129,10 +129,29 @@ vec3 evalLightmappedColor(mat4 invViewMat, float shadowAttenuation, float obscur
 
 <@func declareEvalGlobalLightColor()@>
 
-<$declareEvalSkyboxGlobalColor()$>
+<$declareSkyboxMap()$>
+<$declareAmbientFresnel()$>
 
-vec3 evalGlobalLightColor(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal, vec3 albedo, float metallic, vec3 emissive, float roughness) {
+vec3 evalSkyboxGlobalColorAlpha(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal, vec3 albedo, float metallic, vec3 emissive, float roughness, float opacity) {
-    return evalSkyboxGlobalColor(invViewMat, shadowAttenuation, obscurance, position, normal, albedo, metallic, emissive, roughness);
+    <$prepareGlobalLight()$>
+
+    // Diffuse from ambient
+    color += (1 - metallic) * albedo * evalSphericalLight(getLightAmbientSphere(light), fragNormal).xyz * obscurance * getLightAmbientIntensity(light);
+
+    // Specular highlight from ambient
+    vec3 direction = -reflect(fragEyeDir, fragNormal);
+
+    float levels = getLightAmbientMapNumMips(light);
+    float lod = min(floor((roughness) * levels), levels);
+    vec4 skyboxLight = evalSkyboxLight(direction, lod);
+    vec3 ambientFresnel = fresnelSchlickAmbient(fresnel, fragEyeDir, fragNormal, 1 - roughness);
+    color += ambientFresnel * skyboxLight.rgb * obscurance * getLightAmbientIntensity(light) / opacity;
+
+    return color;
+}
+
+vec3 evalGlobalLightColor(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal, vec3 albedo, float metallic, vec3 emissive, float roughness, float opacity) {
+    return evalSkyboxGlobalColorAlpha(invViewMat, shadowAttenuation, obscurance, position, normal, albedo, metallic, emissive, roughness, opacity);
 }
 <@endfunc@>
 

libraries/render-utils/src/GeometryCache.cpp

@@ -506,9 +506,9 @@ GeometryCache::GeometryCache() :
         std::make_shared<render::ShapePipeline>(getSimplePipeline(), nullptr,
             [](const render::ShapePipeline&, gpu::Batch& batch) {
                 // Set the defaults needed for a simple program
-                batch.setResourceTexture(render::ShapePipeline::Slot::ALBEDO_MAP,
+                batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO,
                     DependencyManager::get<TextureCache>()->getWhiteTexture());
-                batch.setResourceTexture(render::ShapePipeline::Slot::NORMAL_FITTING_MAP,
+                batch.setResourceTexture(render::ShapePipeline::Slot::MAP::NORMAL_FITTING,
                     DependencyManager::get<TextureCache>()->getNormalFittingTexture());
             }
         );
@@ -1736,11 +1736,11 @@ void GeometryCache::bindSimpleProgram(gpu::Batch& batch, bool textured, bool cul
 
     // If not textured, set a default albedo map
     if (!textured) {
-        batch.setResourceTexture(render::ShapePipeline::Slot::ALBEDO_MAP,
+        batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO,
             DependencyManager::get<TextureCache>()->getWhiteTexture());
     }
     // Set a default normal map
-    batch.setResourceTexture(render::ShapePipeline::Slot::NORMAL_FITTING_MAP,
+    batch.setResourceTexture(render::ShapePipeline::Slot::MAP::NORMAL_FITTING,
         DependencyManager::get<TextureCache>()->getNormalFittingTexture());
 }
 
@@ -1758,7 +1758,7 @@ gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool culled
         _emissiveShader = gpu::Shader::createProgram(VS, PSEmissive);
         
         gpu::Shader::BindingSet slotBindings;
-        slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), render::ShapePipeline::Slot::NORMAL_FITTING_MAP));
+        slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), render::ShapePipeline::Slot::MAP::NORMAL_FITTING));
         gpu::Shader::makeProgram(*_simpleShader, slotBindings);
         gpu::Shader::makeProgram(*_emissiveShader, slotBindings);
     });

libraries/render-utils/src/MaterialTextures.slh

@@ -11,6 +11,39 @@
 <@if not MODEL_MATERIAL_TEXTURES_SLH@>
 <@def MODEL_MATERIAL_TEXTURES_SLH@>
 
+
+<@func declareMaterialTexMapArrayBuffer()@>
+
+const int MAX_TEXCOORDS = 2;
+
+struct TexMapArray { 
+    mat4 _texcoordTransforms[MAX_TEXCOORDS];
+    vec4 _lightmapParams;
+};
+
+uniform texMapArrayBuffer {
+    TexMapArray _texMapArray;
+};
+
+TexMapArray getTexMapArray() {
+    return _texMapArray;
+}
+
+<@func evalTexMapArrayTexcoord0(texMapArray, inTexcoord0, outTexcoord0)@>
+{
+    <$outTexcoord0$> = (<$texMapArray$>._texcoordTransforms[0] * vec4(<$inTexcoord0$>.st, 0.0, 1.0)).st;
+}
+<@endfunc@>
+
+<@func evalTexMapArrayTexcoord1(texMapArray, inTexcoord1, outTexcoord1)@>
+{
+    <$outTexcoord1$> = (<$texMapArray$>._texcoordTransforms[1] * vec4(<$inTexcoord1$>.st, 0.0, 1.0)).st;
+}
+<@endfunc@>
+
+<@endfunc@>
+
+
 <@func declareMaterialTextures(withAlbedo, withRoughness, withNormal, withMetallic, withEmissive, withOcclusion)@>
 
 <@if withAlbedo@>
@@ -80,9 +113,12 @@ float fetchOcclusionMap(vec2 uv) {
 
 
 <@func declareMaterialLightmap()@>
+
+<$declareMaterialTexMapArrayBuffer()$>
+
 uniform sampler2D emissiveMap;
-uniform vec2 emissiveParams;
 vec3 fetchLightmapMap(vec2 uv) {
+    vec2 emissiveParams = getTexMapArray()._lightmapParams.xy;
     return (vec3(emissiveParams.x) + emissiveParams.y * texture(emissiveMap, uv).rgb);
 }
 <@endfunc@>

libraries/render-utils/src/MeshPartPayload.cpp

@@ -138,82 +138,78 @@ void MeshPartPayload::bindMaterial(gpu::Batch& batch, const ShapePipeline::Locat
 
     auto textureCache = DependencyManager::get<TextureCache>();
 
-    batch.setUniformBuffer(ShapePipeline::Slot::MATERIAL_GPU, _drawMaterial->getSchemaBuffer());
+    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::MATERIAL, _drawMaterial->getSchemaBuffer());
+    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::TEXMAPARRAY, _drawMaterial->getTexMapArrayBuffer());
 
     auto materialKey = _drawMaterial->getKey();
     auto textureMaps = _drawMaterial->getTextureMaps();
-    glm::mat4 texcoordTransform[2];
 
     // Albedo
     if (materialKey.isAlbedoMap()) {
         auto albedoMap = textureMaps[model::MaterialKey::ALBEDO_MAP];
         if (albedoMap && albedoMap->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO_MAP, albedoMap->getTextureView());
+            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, albedoMap->getTextureView());
-
-            if (!albedoMap->getTextureTransform().isIdentity()) {
-                albedoMap->getTextureTransform().getMatrix(texcoordTransform[0]);
-            }
         } else {
-            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO_MAP, textureCache->getGrayTexture());
+            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getGrayTexture());
         }
     } else {
-        batch.setResourceTexture(ShapePipeline::Slot::ALBEDO_MAP, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getWhiteTexture());
     }
 
     // Roughness map
     if (materialKey.isRoughnessMap()) {
         auto roughnessMap = textureMaps[model::MaterialKey::ROUGHNESS_MAP];
         if (roughnessMap && roughnessMap->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::ROUGHNESS_MAP, roughnessMap->getTextureView());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, roughnessMap->getTextureView());
 
             // texcoord are assumed to be the same has albedo
         } else {
-            batch.setResourceTexture(ShapePipeline::Slot::ROUGHNESS_MAP, textureCache->getWhiteTexture());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
         }
     } else {
-        batch.setResourceTexture(ShapePipeline::Slot::ROUGHNESS_MAP, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
     }
 
     // Normal map
     if (materialKey.isNormalMap()) {
         auto normalMap = textureMaps[model::MaterialKey::NORMAL_MAP];
         if (normalMap && normalMap->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::NORMAL_MAP, normalMap->getTextureView());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, normalMap->getTextureView());
 
             // texcoord are assumed to be the same has albedo
         } else {
-            batch.setResourceTexture(ShapePipeline::Slot::NORMAL_MAP, textureCache->getBlueTexture());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
         }
     } else {
-        batch.setResourceTexture(ShapePipeline::Slot::NORMAL_MAP, nullptr);
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, nullptr);
     }
 
     // Metallic map
     if (materialKey.isMetallicMap()) {
         auto specularMap = textureMaps[model::MaterialKey::METALLIC_MAP];
         if (specularMap && specularMap->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::METALLIC_MAP, specularMap->getTextureView());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, specularMap->getTextureView());
 
             // texcoord are assumed to be the same has albedo
         } else {
-            batch.setResourceTexture(ShapePipeline::Slot::METALLIC_MAP, textureCache->getBlackTexture());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
         }
     } else {
-        batch.setResourceTexture(ShapePipeline::Slot::METALLIC_MAP, nullptr);
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, nullptr);
     }
 
     // Occlusion map
     if (materialKey.isOcclusionMap()) {
         auto specularMap = textureMaps[model::MaterialKey::OCCLUSION_MAP];
         if (specularMap && specularMap->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::OCCLUSION_MAP, specularMap->getTextureView());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, specularMap->getTextureView());
 
             // texcoord are assumed to be the same has albedo
         } else {
-            batch.setResourceTexture(ShapePipeline::Slot::OCCLUSION_MAP, textureCache->getWhiteTexture());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
         }
     } else {
-        batch.setResourceTexture(ShapePipeline::Slot::OCCLUSION_MAP, nullptr);
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, nullptr);
     }
 
     // Emissive / Lightmap
@@ -221,33 +217,20 @@ void MeshPartPayload::bindMaterial(gpu::Batch& batch, const ShapePipeline::Locat
         auto lightmapMap = textureMaps[model::MaterialKey::LIGHTMAP_MAP];
 
         if (lightmapMap && lightmapMap->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::EMISSIVE_LIGHTMAP_MAP, lightmapMap->getTextureView());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, lightmapMap->getTextureView());
-
-            auto lightmapOffsetScale = lightmapMap->getLightmapOffsetScale();
-            batch._glUniform2f(locations->emissiveParams, lightmapOffsetScale.x, lightmapOffsetScale.y);
-
-            if (!lightmapMap->getTextureTransform().isIdentity()) {
-                lightmapMap->getTextureTransform().getMatrix(texcoordTransform[1]);
-            }
         } else {
-            batch.setResourceTexture(ShapePipeline::Slot::EMISSIVE_LIGHTMAP_MAP, textureCache->getGrayTexture());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getGrayTexture());
         }
     } else if (materialKey.isEmissiveMap()) {
         auto emissiveMap = textureMaps[model::MaterialKey::EMISSIVE_MAP];
 
         if (emissiveMap && emissiveMap->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::EMISSIVE_LIGHTMAP_MAP, emissiveMap->getTextureView());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, emissiveMap->getTextureView());
         } else {
-            batch.setResourceTexture(ShapePipeline::Slot::EMISSIVE_LIGHTMAP_MAP, textureCache->getBlackTexture());
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
         }
     } else {
-        batch.setResourceTexture(ShapePipeline::Slot::EMISSIVE_LIGHTMAP_MAP, nullptr);
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, nullptr);
-    }
-
-    // Texcoord transforms ?
-    if (locations->texcoordMatrices >= 0) {
-        batch._glUniformMatrix4fv(locations->texcoordMatrices, 2, false, (const float*)&texcoordTransform);
-       // batch._glUniformMatrix4fv(locations->texcoordMatrices, (materialKey.isLightmapMap() ? 2 : 1), false, (const float*)&texcoordTransform);
     }
 }
 
@@ -491,9 +474,9 @@ void ModelMeshPartPayload::bindTransform(gpu::Batch& batch, const ShapePipeline:
     Transform transform;
     if (state.clusterBuffer) {
         if (canCauterize && _model->getCauterizeBones()) {
-            batch.setUniformBuffer(ShapePipeline::Slot::SKINNING_GPU, state.cauterizedClusterBuffer);
+            batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::SKINNING, state.cauterizedClusterBuffer);
         } else {
-            batch.setUniformBuffer(ShapePipeline::Slot::SKINNING_GPU, state.clusterBuffer);
+            batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::SKINNING, state.clusterBuffer);
         }
     } else {
         if (canCauterize && _model->getCauterizeBones()) {

libraries/render-utils/src/RenderPipelines.cpp

@@ -75,20 +75,16 @@ gpu::BufferView getDefaultMaterialBuffer() {
 
 void batchSetter(const ShapePipeline& pipeline, gpu::Batch& batch) {
     // Set a default albedo map
-    batch.setResourceTexture(render::ShapePipeline::Slot::ALBEDO_MAP,
+    batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO,
         DependencyManager::get<TextureCache>()->getWhiteTexture());
     // Set a default normal map
-    batch.setResourceTexture(render::ShapePipeline::Slot::NORMAL_FITTING_MAP,
+    batch.setResourceTexture(render::ShapePipeline::Slot::MAP::NORMAL_FITTING,
         DependencyManager::get<TextureCache>()->getNormalFittingTexture());
-    // Set default coordinates
+
-    if (pipeline.locations->texcoordMatrices >= 0) {
-        static const glm::mat4 TEX_COORDS[2];
-        batch._glUniformMatrix4fv(pipeline.locations->texcoordMatrices, 2, false, (const float*)&TEX_COORDS);
-    }
     // Set a default material
     if (pipeline.locations->materialBufferUnit >= 0) {
         static const gpu::BufferView OPAQUE_SCHEMA_BUFFER = getDefaultMaterialBuffer();
-        batch.setUniformBuffer(ShapePipeline::Slot::MATERIAL_GPU, OPAQUE_SCHEMA_BUFFER);
+        batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::MATERIAL, OPAQUE_SCHEMA_BUFFER);
     }
 }
 

libraries/render-utils/src/Skinning.slh

@@ -11,7 +11,6 @@
 <@if not SKINNING_SLH@>
 <@def SKINNING_SLH@>
 
-const int MAX_TEXCOORDS = 2;
 const int MAX_CLUSTERS = 128;
 const int INDICES_PER_VERTEX = 4;
 

libraries/render-utils/src/model.slv

@@ -16,8 +16,8 @@
 <@include gpu/Transform.slh@>
 <$declareStandardTransform()$>
 
-const int MAX_TEXCOORDS = 2;
+<@include MaterialTextures.slh@>
-uniform mat4 texcoordMatrices[MAX_TEXCOORDS];
+<$declareMaterialTexMapArrayBuffer()$>
 
 out vec3 _color;
 out float _alpha;
@@ -29,7 +29,8 @@ void main(void) {
     _color = colorToLinearRGB(inColor.xyz);
     _alpha = inColor.w;
 
-    _texCoord0 = (texcoordMatrices[0] * vec4(inTexCoord0.st, 0.0, 1.0)).st;
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
 
     // standard transform
     TransformCamera cam = getTransformCamera();

libraries/render-utils/src/model_lightmap.slf

@@ -30,7 +30,7 @@ void main(void) {
     Material mat = getMaterial();
     int matKey = getMaterialKey(mat);
     <$fetchMaterialTextures(matKey, _texCoord0, albedo, roughness)$>
-    <$fetchMaterialLightmap(_texCoord1, emissive)$>
+    <$fetchMaterialLightmap(_texCoord1, lightmapVal)$>
 
 
     packDeferredFragmentLightmap(
@@ -40,5 +40,5 @@ void main(void) {
         getMaterialRoughness(mat) * roughness,
         getMaterialMetallic(mat),
         getMaterialFresnel(mat),
-        (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb));
+        lightmapVal);
 }

libraries/render-utils/src/model_lightmap.slv

@@ -17,9 +17,8 @@
 <@include gpu/Transform.slh@>
 <$declareStandardTransform()$>
 
-const int MAX_TEXCOORDS = 2;
+<@include MaterialTextures.slh@>
-
+<$declareMaterialTexMapArrayBuffer()$>
-uniform mat4 texcoordMatrices[MAX_TEXCOORDS];
 
 out vec4 _position;
 out vec2 _texCoord0;
@@ -32,8 +31,9 @@ void main(void) {
     _color = colorToLinearRGB(inColor.xyz);
 
     // and the texture coordinates
-    _texCoord0 = (texcoordMatrices[0] * vec4(inTexCoord0.st, 0.0, 1.0)).st;
+    TexMapArray texMapArray = getTexMapArray();
-    _texCoord1 = (texcoordMatrices[1] * vec4(inTexCoord1.st, 0.0, 1.0)).st;
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord1, _texCoord1)$>
 
     // standard transform
     TransformCamera cam = getTransformCamera();

libraries/render-utils/src/model_lightmap_normal_map.slv

@@ -17,9 +17,8 @@
 <@include gpu/Transform.slh@>
 <$declareStandardTransform()$>
 
-const int MAX_TEXCOORDS = 2;
+<@include MaterialTextures.slh@>
-
+<$declareMaterialTexMapArrayBuffer()$>
-uniform mat4 texcoordMatrices[MAX_TEXCOORDS];
 
 out vec4 _position;
 out vec2 _texCoord0;
@@ -32,9 +31,9 @@ void main(void) {
     // pass along the color in linear space
     _color = colorToLinearRGB(inColor.xyz);
 
-    // and the texture coordinates
+    TexMapArray texMapArray = getTexMapArray();
-    _texCoord0 = (texcoordMatrices[0] * vec4(inTexCoord0.st, 0.0, 1.0)).st;
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
-    _texCoord1 = (texcoordMatrices[1] * vec4(inTexCoord1.st, 0.0, 1.0)).st;
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord1, _texCoord1)$>
 
     // standard transform
     TransformCamera cam = getTransformCamera();

libraries/render-utils/src/model_normal_map.slv

@@ -17,9 +17,8 @@
 <@include gpu/Transform.slh@>
 <$declareStandardTransform()$>
 
-const int MAX_TEXCOORDS = 2;
+<@include MaterialTextures.slh@>
-
+<$declareMaterialTexMapArrayBuffer()$>
-uniform mat4 texcoordMatrices[MAX_TEXCOORDS];
 
 out vec4 _position;
 out vec2 _texCoord0;
@@ -33,8 +32,8 @@ void main(void) {
     _color = colorToLinearRGB(inColor.rgb);
     _alpha = inColor.a;
 
-    // and the texture coordinates
+    TexMapArray texMapArray = getTexMapArray();
-    _texCoord0 = (texcoordMatrices[0] * vec4(inTexCoord0.xy, 0.0, 1.0)).st;
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
 
     // standard transform
     TransformCamera cam = getTransformCamera();

libraries/render-utils/src/model_translucent.slf

@@ -59,7 +59,7 @@ void main(void) {
 
     TransformCamera cam = getTransformCamera();
 
-    _fragColor =  vec4(evalSkyboxGlobalColor(
+    _fragColor =  vec4(evalGlobalLightColor(
         cam._viewInverse,
         1.0,
         1.0,
@@ -68,6 +68,6 @@ void main(void) {
         albedo,
         metallic,
         emissive,
-        roughness),
+        roughness, opacity),
         opacity);
 }

libraries/render-utils/src/skin_model.slv

@@ -19,7 +19,8 @@
 
 <@include Skinning.slh@>
 
-uniform mat4 texcoordMatrices[MAX_TEXCOORDS];
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
 
 out vec4 _position;
 out vec2 _texCoord0;
@@ -37,9 +38,9 @@ void main(void) {
     _color = colorToLinearRGB(inColor.rgb);
     _alpha = inColor.a;
 
-    // and the texture coordinates
+    TexMapArray texMapArray = getTexMapArray();
-    _texCoord0 = (texcoordMatrices[0] * vec4(inTexCoord0.st, 0.0, 1.0)).st;
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
-    
+
     // standard transform
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();

libraries/render-utils/src/skin_model_normal_map.slv

@@ -19,7 +19,8 @@
 
 <@include Skinning.slh@>
 
-uniform mat4 texcoordMatrices[MAX_TEXCOORDS];
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
 
 out vec4 _position;
 out vec2 _texCoord0;
@@ -39,9 +40,9 @@ void main(void) {
     _color = colorToLinearRGB(inColor.rgb);
     _alpha = inColor.a;
 
-    // and the texture coordinates
+    TexMapArray texMapArray = getTexMapArray();
-    _texCoord0 = (texcoordMatrices[0] * vec4(inTexCoord0.st, 0.0, 1.0)).st;
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
-    
+
     interpolatedNormal = vec4(normalize(interpolatedNormal.xyz), 0.0);
     interpolatedTangent = vec4(normalize(interpolatedTangent.xyz), 0.0);
 

libraries/render/src/render/ShapePipeline.cpp

@@ -51,23 +51,22 @@ void ShapePlumber::addPipeline(const Key& key, const gpu::ShaderPointer& program
 void ShapePlumber::addPipeline(const Filter& filter, const gpu::ShaderPointer& program, const gpu::StatePointer& state,
         BatchSetter batchSetter) {
     gpu::Shader::BindingSet slotBindings;
-    slotBindings.insert(gpu::Shader::Binding(std::string("skinClusterBuffer"), Slot::SKINNING_GPU));
+    slotBindings.insert(gpu::Shader::Binding(std::string("skinClusterBuffer"), Slot::BUFFER::SKINNING));
-    slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), Slot::MATERIAL_GPU));
+    slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), Slot::BUFFER::MATERIAL));
-    slotBindings.insert(gpu::Shader::Binding(std::string("albedoMap"), Slot::ALBEDO_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("texMapArrayBuffer"), Slot::BUFFER::TEXMAPARRAY));
-    slotBindings.insert(gpu::Shader::Binding(std::string("roughnessMap"), Slot::ROUGHNESS_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("albedoMap"), Slot::MAP::ALBEDO));
-    slotBindings.insert(gpu::Shader::Binding(std::string("normalMap"), Slot::NORMAL_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("roughnessMap"), Slot::MAP::ROUGHNESS));
-    slotBindings.insert(gpu::Shader::Binding(std::string("metallicMap"), Slot::METALLIC_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("normalMap"), Slot::MAP::NORMAL));
-    slotBindings.insert(gpu::Shader::Binding(std::string("emissiveMap"), Slot::EMISSIVE_LIGHTMAP_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("metallicMap"), Slot::MAP::METALLIC));
-    slotBindings.insert(gpu::Shader::Binding(std::string("occlusionMap"), Slot::OCCLUSION_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("emissiveMap"), Slot::MAP::EMISSIVE_LIGHTMAP));
-    slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), Slot::LIGHT_BUFFER));
+    slotBindings.insert(gpu::Shader::Binding(std::string("occlusionMap"), Slot::MAP::OCCLUSION));
-    slotBindings.insert(gpu::Shader::Binding(std::string("skyboxMap"), Slot::LIGHT_AMBIENT_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), Slot::BUFFER::LIGHT));
-    slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), Slot::NORMAL_FITTING_MAP));
+    slotBindings.insert(gpu::Shader::Binding(std::string("skyboxMap"), Slot::MAP::LIGHT_AMBIENT));
+    slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), Slot::NORMAL_FITTING));
 
     gpu::Shader::makeProgram(*program, slotBindings);
 
     auto locations = std::make_shared<Locations>();
-    locations->texcoordMatrices = program->getUniforms().findLocation("texcoordMatrices");
-    locations->emissiveParams = program->getUniforms().findLocation("emissiveParams");
     locations->normalFittingMapUnit = program->getTextures().findLocation("normalFittingMap");
     locations->albedoTextureUnit = program->getTextures().findLocation("albedoMap");
     locations->roughnessTextureUnit = program->getTextures().findLocation("roughnessMap");
@@ -77,8 +76,9 @@ void ShapePlumber::addPipeline(const Filter& filter, const gpu::ShaderPointer& p
     locations->occlusionTextureUnit = program->getTextures().findLocation("occlusionMap");
     locations->skinClusterBufferUnit = program->getBuffers().findLocation("skinClusterBuffer");
     locations->materialBufferUnit = program->getBuffers().findLocation("materialBuffer");
+    locations->texMapArrayBufferUnit = program->getBuffers().findLocation("texMapArrayBuffer");
     locations->lightBufferUnit = program->getBuffers().findLocation("lightBuffer");
-    locations->lightAmbientMapUnit = program->getBuffers().findLocation("skyboxMap");
+    locations->lightAmbientMapUnit = program->getTextures().findLocation("skyboxMap");
 
     ShapeKey key{filter._flags};
     auto gpuPipeline = gpu::Pipeline::create(program, state);

libraries/render/src/render/ShapePipeline.h

@@ -193,33 +193,38 @@ class ShapePipeline {
 public:
     class Slot {
     public:
-        static const int SKINNING_GPU = 2;
+        enum BUFFER {
-        static const int MATERIAL_GPU = 3;
+            SKINNING = 2,
-        static const int ALBEDO_MAP = 0;
+            MATERIAL,
-        static const int NORMAL_MAP = 1;
+            TEXMAPARRAY,
-        static const int METALLIC_MAP = 2;
+            LIGHT
-        static const int EMISSIVE_LIGHTMAP_MAP = 3;
+        };
-        static const int ROUGHNESS_MAP = 4;
-        static const int OCCLUSION_MAP = 5;
 
-        static const int LIGHT_BUFFER = 4;
+        enum MAP {
-        static const int LIGHT_AMBIENT_MAP = 6;
+            ALBEDO = 0,
-        static const int NORMAL_FITTING_MAP = 10;
+            NORMAL,
+            METALLIC,
+            EMISSIVE_LIGHTMAP,
+            ROUGHNESS,
+            OCCLUSION,
+            LIGHT_AMBIENT,
+
+            NORMAL_FITTING = 10,
+        };
     };
 
     class Locations {
     public:
-        int texcoordMatrices;
         int albedoTextureUnit;
         int normalTextureUnit;
         int roughnessTextureUnit;
         int metallicTextureUnit;
         int emissiveTextureUnit;
         int occlusionTextureUnit;
-        int emissiveParams;
         int normalFittingMapUnit;
         int skinClusterBufferUnit;
         int materialBufferUnit;
+        int texMapArrayBufferUnit;
         int lightBufferUnit;
         int lightAmbientMapUnit;
     };

libraries/shared/src/GPUIdent.cpp

@@ -147,7 +147,7 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
 
             _isValid = true;
         }
-        hr = spEnumInst->Next(WBEM_INFINITE, 1, &spInstance, &uNumOfInstances);
+        hr = spEnumInst->Next(WBEM_INFINITE, 1, &spInstance.p, &uNumOfInstances);
     }
 #endif
     return this;

libraries/shared/src/GeometryUtil.cpp

@@ -564,3 +564,17 @@ void swingTwistDecomposition(const glm::quat& rotation,
     // rotation = swing * twist  -->  swing = rotation * invTwist
     swing = rotation * glm::inverse(twist);
 }
+
+// calculate the minimum angle between a point and a sphere.
+float coneSphereAngle(const glm::vec3& coneCenter, const glm::vec3& coneDirection, const glm::vec3& sphereCenter, float sphereRadius) {
+    glm::vec3 d = sphereCenter - coneCenter;
+    float dLen = glm::length(d);
+
+    // theta is the angle between the coneDirection normal and the center of the sphere.
+    float theta = acosf(glm::dot(d, coneDirection) / dLen);
+
+    // phi is the deflection angle from the center of the sphere to a point tangent to the sphere.
+    float phi = atanf(sphereRadius / dLen);
+
+    return glm::max(0.0f, theta - phi);
+}

libraries/shared/src/GeometryUtil.h

@@ -110,6 +110,8 @@ bool doLineSegmentsIntersect(glm::vec2 r1p1, glm::vec2 r1p2, glm::vec2 r2p1, glm
 bool isOnSegment(float xi, float yi, float xj, float yj, float xk, float yk);
 int computeDirection(float xi, float yi, float xj, float yj, float xk, float yk);
 
+// calculate the angle between a point on a sphere that is closest to the cone.
+float coneSphereAngle(const glm::vec3& coneCenter, const glm::vec3& coneDirection, const glm::vec3& sphereCenter, float sphereRadius);
 
 typedef glm::vec2 LineSegment2[2];