Merge pull request #7730 from imgntn/defaultScripts

/scripts for launch

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

@@ -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}
   )

libraries/script-engine/src/ScriptEngines.cpp

@@ -253,7 +253,7 @@ static const QString SETTINGS_KEY = "Settings";
 
 void ScriptEngines::loadDefaultScripts() {
     QUrl defaultScriptsLoc = defaultScriptsLocation();
-    defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "/defaultScripts.js");
+    defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "/system/defaultScripts.js");
     loadScript(defaultScriptsLoc.toString());
 }