Skip to content

Commit

Permalink
Merge branch 'shader-optimizations'
Browse files Browse the repository at this point in the history
  • Loading branch information
xeolabs committed Jun 3, 2015
2 parents 350b8c8 + bc8c36b commit d51ec42
Show file tree
Hide file tree
Showing 1,228 changed files with 667,352 additions and 164,108 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
dist/
docs/
node_modules
14 changes: 14 additions & 0 deletions BANNER
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* <%= pkg.title %> V<%= pkg.version %>
*
* <%= pkg.description %>
* <%= pkg.homepage %>
*
* Built on <%= grunt.template.today("yyyy-mm-dd") %>
*
* <%= pkg.license %>
* Copyright <%= grunt.template.today("yyyy") %>, <%= pkg.author.name %>
* http://xeolabs.com/
*
*/

1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
scenejs.org
68 changes: 68 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
module.exports = function (grunt) {

"use strict";

var devScripts = grunt.file.readJSON("dev-scripts.json");

grunt.initConfig({

pkg: grunt.file.readJSON('package.json'),
PROJECT_NAME: "<%= pkg.name %>",
ENGINE_VERSION: "<%= pkg.version %>",
build_dir: "build/<%= ENGINE_VERSION %>",
license: grunt.file.read("LICENSE.txt"),

concat: {
options: {
banner: grunt.file.read('BANNER'),
separator: ';',
process: true
},
engine: {
src: devScripts.engine,
dest: "<%= build_dir %>/<%= PROJECT_NAME %>-<%= ENGINE_VERSION %>.js"
}
},

uglify: {
options: {
report: "min",
banner: grunt.file.read('BANNER')
},
engine: {
files: {
"<%= build_dir %>/<%= PROJECT_NAME %>-<%= ENGINE_VERSION %>.min.js": "<%= concat.engine.dest %>"
}
}
},

clean: {
tmp: "tmp/*.js",
docs: ["docs/*"]
},

copy: {
minified: {
src: '<%= build_dir %>/<%= PROJECT_NAME %>-<%= ENGINE_VERSION %>.min.js',
dest: 'build/<%= PROJECT_NAME %>.min.js'
},
unminified: {
src: '<%= build_dir %>/<%= PROJECT_NAME %>-<%= ENGINE_VERSION %>.js',
dest: 'build/<%= PROJECT_NAME %>.js'
}
}
});

grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-clean");
grunt.loadNpmTasks('grunt-contrib-copy');


grunt.registerTask("compile", ["clean", "concat", "uglify"]);
grunt.registerTask("build", ["compile"]);
grunt.registerTask("default", "compile");
grunt.registerTask("all", ["build"]);

grunt.registerTask("snapshot", ["concat", "uglify", "copy"]);
};
25 changes: 25 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// === SceneJS ===
// JavaScript Scene graph library for WebGL
// Copyright (c) 2010 Lindsay Kay
//
// 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:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.




87 changes: 31 additions & 56 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,74 +1,49 @@
# SceneJS
## SceneJS

SceneJS is a concise, fast and flexible scene graph framework for WebGL, targeted to be a browser interface
for model and data visualisation systems.
An extensible WebGL-based engine for high-detail 3D visualisation.

Some key features:
* [SceneJS.org](http://scenejs.org)
* [Tutorials](http://xeolabs.com/articles/)
* [Facebook group](http://www.facebook.com/group.php?gid=350488973712)
* [Issues](https://github.com/xeolabs/scenejs/issues)

* flexible JSON API for scene graph create/update/query
* messaging system for peer-to-peer commands to the JSON API
* automatic GLSL generation - fully encapsulated
* IoC container
* GL state sorting
* bounding boxes
* LOD
* flexible data flows
* interpolated animation
* branching
* instancing
* animated textures
* multimaterials
* debugging modes
* and more..

## Downloads

# Building
* [http://scenejs.org/api/latest/scenejs.js](http://scenejs.org/api/latest/scenejs.js)
* [ZIP archive of plugins](http://scenejs.org/api/latest/plugins.zip)

To build SceneJS, you'll need Java and ANT. Then at the same level as build.xml, type:
### Using the Plugins

ant all
To keep the core library small, SceneJS dynamically loads it’s non-core functionality from a directory of plugins,
which it loads on-demand from the plugins directory within this GitHub repository.

Create the "dist" directory, which will contain all the SceneJS libraries, JSDocs and examples.
You can hotlink to this library if you're OK with using the plugins from this repo and don't need any plugins that
provide textures, (because those textures won't load cross-domain).

If you are modifying the source code and testing it with a new example or your own project the following
ant tasks which complete in just a couple of seconds may be helpful. These tasks do not clean the dist
directory so previously-generated JSDocs will still available
If not, then just do this:

ant package-lib
1. get a copy of the library
2. get the [ZIP archive of plugins](http://scenejs.org/api/latest/plugins.zip)
3. unzip that archive, say to directory ```myDir```
4. configure SceneJS to load the plugins from there, like this:

Create the "dist" directory and populate the lib directory with scenejs.js, scenejs.min.js, and the plugins and utils directories.
``` javascript
SceneJS.setConfigs({
pluginPath: "./myDir/plugins"
});
```

ant packge-examples
Then off you go, start building a scene:

Create the "dist" directory and populate the lib directory and the examples directory.
```javascript
var myScene = SceneJS.createScene({
// ...
});
```

Read more in the [Quick Start tutorial](http://xeolabs.com/articles/scenejs-quick-start).

# Resources

Website:
http://scenejs.org

Contributors:
http://scenejs.wikispaces.com/Contributors

Live examples:
http://scenejs.org/dist/curr/extr/examples/index.html

Wiki:
http://scenejs.wikispaces.com/

Facebook Group:
http://www.facebook.com/group.php?gid=350488973712

YouTube channel:
http://www.youtube.com/user/xeolabs

Twitter:
http://twitter.com/xeolabs

Google group:
http://groups.google.co.nz/group/scenejs?lnk=gcimh

Issue tracker:
http://bit.ly/9Cpzi0

61 changes: 0 additions & 61 deletions README.txt

This file was deleted.

Loading

0 comments on commit d51ec42

Please sign in to comment.