From a41464daba206a10e71491e067cdb2ce34948ecb Mon Sep 17 00:00:00 2001 From: Tentone Date: Sun, 1 Jan 2017 23:25:42 +0000 Subject: [PATCH] Particle editor UI tweaks --- LICENSE | 2 +- README.md | 9 +++++++-- build/nunu.js | 4 ++-- build/nunu.min.js | 2 +- source/Nunu.js | 4 ++-- source/editor/ui/element/Form.js | 1 + source/editor/ui/element/ImageBox.js | 1 + source/editor/ui/tab/ParticleEditor.js | 3 +++ 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 0b09d95e5..ed531e8f0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ The MIT License (MIT) -Copyright (c) 2016 Tentone +Copyright (c) 2017 Tentone Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index f0465d7b6..81fce9bc0 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ nunuStudio is a JS based framework for 3D and VR applications that run direcly o - NWJS and Cordova used for easy desktop and mobile deployment - Physics engine (cannon.js) - SPE particle system -- Microft Kinect and Leap Motion support - - Kinect only supported in Windows projects +- Microsoft Kinect and Leap Motion support + - Microsoft Kinect only supported in Windows projects - WebVR 1.1 compatible ### Screenshots @@ -53,10 +53,13 @@ nunuStudio is a JS based framework for 3D and VR applications that run direcly o - Added program.sendDataApp and app.setOnDataReceived for app/page communication - Renamed NunuRuntime to NunuApp (Makes more sense) - Fixed copy/paste inside object panels +- V0.8.9.17 Alpha + - Particle editor position, velocity and acceleration delta now shows in different a row ### Runtime - nunuStudio apps are meant to be used inside web pages - To embed applications made inside nunuStudio in web pages the following code can be used +- nunuStudio can export full page web apps with a fullscreen and vr buttons by default ```javascript var app = new NunuApp(); @@ -89,6 +92,8 @@ nunuStudio uses a number of open source projects to work properly - codemirror.net - LeapJS - github.com/leapmotion/leapjs +- JSHint + - jshint.com ### Installation - nunuStudio is intended to run with NWJS direcly on the desktop diff --git a/build/nunu.js b/build/nunu.js index 152116802..d235e2211 100644 --- a/build/nunu.js +++ b/build/nunu.js @@ -24,8 +24,8 @@ function Nunu() { } Nunu.NAME = "nunuStudio"; -Nunu.VERSION = "V0.8.9.16 Alpha"; -Nunu.TIMESTAMP = "201612290236"; +Nunu.VERSION = "V0.8.9.17 Alpha"; +Nunu.TIMESTAMP = "201701011920"; Nunu.webvrAvailable = function() { return void 0 !== navigator.getVRDisplays; }; diff --git a/build/nunu.min.js b/build/nunu.min.js index dc13a1a57..e3a03c73f 100644 --- a/build/nunu.min.js +++ b/build/nunu.min.js @@ -1,4 +1,4 @@ -function Nunu(){}Nunu.NAME='nunuStudio';Nunu.VERSION='V0.8.9.16 Alpha';Nunu.TIMESTAMP='201612290236';Nunu.webvrAvailable=function(){return void 0!==navigator.getVRDisplays}; +function Nunu(){}Nunu.NAME='nunuStudio';Nunu.VERSION='V0.8.9.17 Alpha';Nunu.TIMESTAMP='201701011920';Nunu.webvrAvailable=function(){return void 0!==navigator.getVRDisplays}; (function(a,g){'object'===typeof exports&&'undefined'!==typeof module?g(exports):'function'===typeof define&&define.amd?define(['exports'],g):g(a.THREE=a.THREE||{})})(this,function(a){function g(){}function l(d,m){this.x=d||0;this.y=m||0}function b(d,m,a,c,h,e,p,f,k,q){Object.defineProperty(this,'id',{value:Ve++});this.uuid=la.generateUUID();this.name='';this.image=void 0!==d?d:b.DEFAULT_IMAGE;this.mipmaps=[];this.mapping=void 0!==m?m:b.DEFAULT_MAPPING;this.wrapS=void 0!==a?a:1001;this.wrapT=void 0!== c?c:1001;this.magFilter=void 0!==h?h:1006;this.minFilter=void 0!==e?e:1008;this.anisotropy=void 0!==k?k:1;this.format=void 0!==p?p:1023;this.type=void 0!==f?f:1009;this.offset=new l(0,0);this.repeat=new l(1,1);this.generateMipmaps=!0;this.premultiplyAlpha=!1;this.flipY=!0;this.unpackAlignment=4;this.encoding=void 0!==q?q:3E3;this.version=0;this.onUpdate=null}function k(d,m,a,b){this.x=d||0;this.y=m||0;this.z=a||0;this.w=void 0!==b?b:1}function f(d,m,a){this.uuid=la.generateUUID();this.width=d;this.height= m;this.scissor=new k(0,0,d,m);this.scissorTest=!1;this.viewport=new k(0,0,d,m);a=a||{};void 0===a.minFilter&&(a.minFilter=1006);this.texture=new b(void 0,void 0,a.wrapS,a.wrapT,a.magFilter,a.minFilter,a.format,a.type,a.anisotropy,a.encoding);this.depthBuffer=void 0!==a.depthBuffer?a.depthBuffer:!0;this.stencilBuffer=void 0!==a.stencilBuffer?a.stencilBuffer:!0;this.depthTexture=void 0!==a.depthTexture?a.depthTexture:null}function c(d,m,a){f.call(this,d,m,a);this.activeMipMapLevel=this.activeCubeFace= diff --git a/source/Nunu.js b/source/Nunu.js index f7991884b..9fc7d294b 100644 --- a/source/Nunu.js +++ b/source/Nunu.js @@ -3,8 +3,8 @@ function Nunu(){} Nunu.NAME = "nunuStudio"; -Nunu.VERSION = "V0.8.9.16 Alpha"; -Nunu.TIMESTAMP = "201612290236"; +Nunu.VERSION = "V0.8.9.17 Alpha"; +Nunu.TIMESTAMP = "201701011920"; //Check if webvr is available Nunu.webvrAvailable = function() diff --git a/source/editor/ui/element/Form.js b/source/editor/ui/element/Form.js index 9612c35ae..e93adfbc5 100644 --- a/source/editor/ui/element/Form.js +++ b/source/editor/ui/element/Form.js @@ -11,6 +11,7 @@ function Form(parent) //Create element this.element = document.createElement("div"); + this.element.id = id; this.element.style.position = "absolute"; //Element atributes diff --git a/source/editor/ui/element/ImageBox.js b/source/editor/ui/element/ImageBox.js index e856ecc4f..722757992 100644 --- a/source/editor/ui/element/ImageBox.js +++ b/source/editor/ui/element/ImageBox.js @@ -11,6 +11,7 @@ function ImageBox(parent) //Create element this.element = document.createElement("div"); + this.element.id = id; this.element.style.position = "absolute"; this.element.style.pointerEvents = "none"; diff --git a/source/editor/ui/tab/ParticleEditor.js b/source/editor/ui/tab/ParticleEditor.js index d72ef8269..48745d2b6 100644 --- a/source/editor/ui/tab/ParticleEditor.js +++ b/source/editor/ui/tab/ParticleEditor.js @@ -236,6 +236,7 @@ function ParticleEditor(parent) self.updateRuntimeParticle(); }); this.form.add(this.position_value); + this.form.nextRow(); this.form.addText("+/-"); this.position_spread = new CoordinatesBox(this.form.element); this.position_spread.setOnChange(function() @@ -255,6 +256,7 @@ function ParticleEditor(parent) self.updateRuntimeParticle(); }); this.form.add(this.velocity_value); + this.form.nextRow(); this.form.addText("+/-"); this.velocity_spread = new CoordinatesBox(this.form.element); this.velocity_spread.setOnChange(function() @@ -274,6 +276,7 @@ function ParticleEditor(parent) self.updateRuntimeParticle(); }); this.form.add(this.acceleration_value); + this.form.nextRow(); this.form.addText("+/-"); this.acceleration_spread = new CoordinatesBox(this.form.element); this.acceleration_spread.setOnChange(function()