Skip to content

Commit

Permalink
Particle editor UI tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
tentone committed Jan 1, 2017
1 parent 5b0bba9 commit a41464d
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion 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:

Expand Down
9 changes: 7 additions & 2 deletions README.md
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/nunu.js
Expand Up @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion build/nunu.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions source/Nunu.js
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions source/editor/ui/element/Form.js
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions source/editor/ui/element/ImageBox.js
Expand Up @@ -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";

Expand Down
3 changes: 3 additions & 0 deletions source/editor/ui/tab/ParticleEditor.js
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down

0 comments on commit a41464d

Please sign in to comment.