mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-22 23:14:10 +02:00
need to fix icon
This commit is contained in:
parent
e4d4044a2b
commit
3adc88aa70
3 changed files with 18 additions and 9 deletions
|
@ -26,7 +26,7 @@ Script.include([
|
||||||
"libraries/entityCameraTool.js",
|
"libraries/entityCameraTool.js",
|
||||||
"libraries/gridTool.js",
|
"libraries/gridTool.js",
|
||||||
"libraries/entityList.js",
|
"libraries/entityList.js",
|
||||||
"particle_explorer/particleExplorerTool.js?v1" + Math.random(),
|
"particle_explorer/particleExplorerTool.js",
|
||||||
"libraries/lightOverlayManager.js",
|
"libraries/lightOverlayManager.js",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -38,17 +38,13 @@ var lightOverlayManager = new LightOverlayManager();
|
||||||
var cameraManager = new CameraManager();
|
var cameraManager = new CameraManager();
|
||||||
|
|
||||||
var grid = Grid();
|
var grid = Grid();
|
||||||
// gridTool = GridTool({
|
|
||||||
// horizontalGrid: grid
|
|
||||||
// });
|
|
||||||
// gridTool.setVisible(false);
|
|
||||||
|
|
||||||
var entityListTool = EntityListTool();
|
var entityListTool = EntityListTool();
|
||||||
|
|
||||||
selectionManager.addEventListener(function() {
|
selectionManager.addEventListener(function() {
|
||||||
selectionDisplay.updateHandles();
|
selectionDisplay.updateHandles();
|
||||||
lightOverlayManager.updatePositions();
|
lightOverlayManager.updatePositions();
|
||||||
});
|
});
|
||||||
|
|
||||||
var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
|
var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
|
||||||
var toolHeight = 50;
|
var toolHeight = 50;
|
||||||
|
@ -322,7 +318,7 @@ var toolBar = (function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
newParticleButton = toolBar.addTool({
|
newParticleButton = toolBar.addTool({
|
||||||
imageURL: toolIconUrl + "polyvox.svg",
|
imageURL: toolIconUrl + "particle.svg?v1",
|
||||||
subImage: {
|
subImage: {
|
||||||
x: 0,
|
x: 0,
|
||||||
y: 0,
|
y: 0,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<!--
|
<!--
|
||||||
// main.js
|
// particleExplorer.hml
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// Created by James B. Pollack @imgntn on 9/26/2015
|
// Created by James B. Pollack @imgntn on 9/26/2015
|
||||||
|
|
|
@ -1,3 +1,17 @@
|
||||||
|
//
|
||||||
|
// particleExplorerTool.js
|
||||||
|
//
|
||||||
|
// Created by Eric Levin on 2/15/16
|
||||||
|
// Copyright 2015 High Fidelity, Inc.
|
||||||
|
// Adds particleExplorer tool to the edit panel when a user selects a particle entity from the edit tool window
|
||||||
|
// This is an example of a new, easy way to do two way bindings between dynamically created GUI and in-world entities.
|
||||||
|
//
|
||||||
|
// Distributed under the Apache License, Version 2.0.
|
||||||
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
|
//
|
||||||
|
/*global window, alert, EventBridge, dat, listenForSettingsUpdates,createVec3Folder,createQuatFolder,writeVec3ToInterface,writeDataToInterface*/
|
||||||
|
|
||||||
|
|
||||||
var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html');
|
var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html');
|
||||||
|
|
||||||
ParticleExplorerTool = function() {
|
ParticleExplorerTool = function() {
|
||||||
|
@ -17,7 +31,6 @@ ParticleExplorerTool = function() {
|
||||||
|
|
||||||
|
|
||||||
that.destroyWebView = function() {
|
that.destroyWebView = function() {
|
||||||
print("EBL DESTROY WEB VIEW" + that.webView);
|
|
||||||
that.webView.close();
|
that.webView.close();
|
||||||
that.webView = null;
|
that.webView = null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue