Skip to content

Commit

Permalink
Merge pull request #31 from rctoris/stable
Browse files Browse the repository at this point in the history
r4 release
  • Loading branch information
rctoris committed Apr 17, 2013
2 parents ee48407 + fa91f52 commit e36345f
Show file tree
Hide file tree
Showing 134 changed files with 16,766 additions and 15,332 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.project
.settings
.svn
.vagrant
node_modules
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
language: node_js
node_js:
- "0.10"

before_script:
- npm install -g karma grunt-cli
- cd utils
- npm install .

script:
- grunt build

14 changes: 0 additions & 14 deletions AUTHORS

This file was deleted.

17 changes: 17 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Original Authors
----------------

* [Russell Toris](http://users.wpi.edu/~rctoris/) (rctoris@wpi.edu)
* Jihoon Lee (jihoonlee.in@gmail.com)
* David Gossow (dgossow@willowgarage.com)

Contributors
------------

* Brandon Alexander (balexander@willowgarage.com)
* Sarah Osentoski (sarah.osentoski@us.bosch.com)
* Benjamin Pitzer (ben.pitzer@gmail.com)
* Xueqiao Xu (xueqiaoxu@gmail.com)
* Mr.doob - (http://mrdoob.com)
* AlteredQualia - (http://alteredqualia.com)

14 changes: 0 additions & 14 deletions CHANGELOG

This file was deleted.

26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
2013-04-15 - **r4**
* Initial pose now set in SceneNode [(rctoris)](https://github.com/rctoris/)
* Texture method for OccupancyGrid changed to canvas to allow for very large maps [(rctoris)](https://github.com/rctoris/)
* OccupancyGrid origin now in corner instead of center of image [(rctoris)](https://github.com/rctoris/)
* Optional TF client added to occupancy grid client [(rctoris)](https://github.com/rctoris/)
* Interactive markers now removed correctly [(rctoris)](https://github.com/rctoris/)
* Viewer now takes an optional initial camera position [(rctoris)](https://github.com/rctoris/)
* Orbit controls fixed to prevent flicker during camera pan [(rctoris)](https://github.com/rctoris/)
* Scale (units) now work in Collada files [(rctoris)](https://github.com/rctoris/)
* Grunt files added and code cleanup for linter [(rctoris)](https://github.com/rctoris/)

2013-04-03 - **r3**
* ColladaLoader2 added as third-party module [(rctoris)](https://github.com/rctoris/)
* ColladaLoader2 replaces THREE.ColladaLoader [(rctoris)](https://github.com/rctoris/)
* Viewer now takes an option intensity for the lighting [(rctoris)](https://github.com/rctoris/)

2013-04-03 - **r2**
* Examples now use CDN version of DAE files [(rctoris)](https://github.com/rctoris/)
* Maps module added with OccupancyGrid and client [(rctoris)](https://github.com/rctoris/)
* SceneNode now takes an optional pose [(rctoris)](https://github.com/rctoris/)
* Bugfix in InteractiveMarkerClient path option [(rctoris)](https://github.com/rctoris/)
* Bugfix in interactive marker feedback [(rctoris)](https://github.com/rctoris/)

2013-03-17 - **r1**
* Initial development of ROS3D [(rctoris)](https://github.com/rctoris/)

44 changes: 15 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,35 @@
ros3djs
========

#### 3D Visualization Library for use with the ROS JavaScript Libraries ####
ros3djs [![Build Status](https://api.travis-ci.org/RobotWebTools/ros3djs.png)](https://travis-ci.org/RobotWebTools/ros3djs)
=======

#### 3D Visualization Library for use with the ROS JavaScript Libraries
For full documentation, see [the ROS wiki](http://ros.org/wiki/ros3djs) or check out some [working demos](http://robotwebtools.org/).

[JSDoc](http://robotwebtools.org/jsdoc/ros3djs/current/) can be found on the Robot Web Tools website.

This project is released as part of the [Robot Web Tools](http://robotwebtools.org/) effort.

### Usage ###
### Usage
Pre-built files can be found in either [ros3d.js](build/ros3d.js) or [ros3d.min.js](build/ros3d.min.js).

Alternatively, you can use the current release via the Robot Web Tools CDN ([full](http://cdn.robotwebtools.org/ros3djs/current/ros3d.js)) | ([min](http://cdn.robotwebtools.org/ros3djs/current/ros3d.min.js))
Alternatively, you can use the current release via the Robot Web Tools CDN: ([full](http://cdn.robotwebtools.org/ros3djs/current/ros3d.js)) | ([min](http://cdn.robotwebtools.org/ros3djs/current/ros3d.min.js))

### Dependencies ###
### Dependencies
ros3djs depends on:

[EventEmitter2](https://github.com/hij1nx/EventEmitter2). The current supported version is 0.4.11.
The current supported version can be found [in this project](include/EventEmitter2/eventemitter2.js) or on the Robot Web Tools CDN ([full](http://cdn.robotwebtools.org/EventEmitter2/0.4.11/eventemitter2.js)) | ([min](http://cdn.robotwebtools.org/EventEmitter2/0.4.11/eventemitter2.min.js))

[three.js](https://github.com/mrdoob/three.js/). The current supported version is r56.
The current supported version can be found [in this project](include/threejs/three.js) or on the Robot Web Tools CDN ([full](http://cdn.robotwebtools.org/threejs/r56/three.js)) | ([min](http://cdn.robotwebtools.org/threejs/r56/three.min.js)).

[ColladaLoader2](https://github.com/crobi/ColladaAnimationCompress). The current supported version is 0.0.1.
The current supported version can be found [in this project](include/ColladaAnimationCompress/ColladaLoader2.js) or on the Robot Web Tools CDN ([full](http://cdn.robotwebtools.org/ColladaAnimationCompress/0.0.1/ColladaLoader2.js)) | ([min](http://cdn.robotwebtools.org/ColladaAnimationCompress/0.0.1/ColladaLoader2.min.js)).

[roslibjs](https://github.com/RobotWebTools/roslibjs). The current supported version is r4.
The current supported version can be found [in this project](include/roslibjs/roslib.js) or on the Robot Web Tools CDN ([full](http://cdn.robotwebtools.org/roslibjs/r4/roslib.js)) | ([min](http://cdn.robotwebtools.org/roslibjs/r4/roslib.min.js)).

### Build ###
To build from source, use the provided [ANT script](utils/build.xml).
[EventEmitter2](https://github.com/hij1nx/EventEmitter2). The current supported version is 0.4.11. The current supported version can be found [in this project](include/EventEmitter2/eventemitter2.js) or on the Robot Web Tools CDN: ([full](http://cdn.robotwebtools.org/EventEmitter2/0.4.11/eventemitter2.js)) | ([min](http://cdn.robotwebtools.org/EventEmitter2/0.4.11/eventemitter2.min.js))

The script requires ANT, YUI Compressor, and JSDoc. To install these on an Ubuntu machine, use the following:
[three.js](https://github.com/mrdoob/three.js/). The current supported version is r56. The current supported version can be found [in this project](include/threejs/three.js) or on the Robot Web Tools CDN: ([full](http://cdn.robotwebtools.org/threejs/r56/three.js)) | ([min](http://cdn.robotwebtools.org/threejs/r56/three.min.js))

sudo apt-get install ant yui-compressor jsdoc-toolkit
[ColladaLoader2](https://github.com/crobi/ColladaAnimationCompress). The current supported version is 0.0.1. The current supported version can be found [in this project](include/ColladaAnimationCompress/ColladaLoader2.js) or on the Robot Web Tools CDN: ([full](http://cdn.robotwebtools.org/ColladaAnimationCompress/0.0.1/ColladaLoader2.js)) | ([min](http://cdn.robotwebtools.org/ColladaAnimationCompress/0.0.1/ColladaLoader2.min.js))

To run the build script, use the following:
[roslibjs](https://github.com/RobotWebTools/roslibjs). The current supported version is r5. The current supported version can be found [in this project](include/roslibjs/roslib.js) or on the Robot Web Tools CDN: ([full](http://cdn.robotwebtools.org/roslibjs/r5/roslib.js)) | ([min](http://cdn.robotwebtools.org/roslibjs/r5/roslib.min.js))

cd utils/
ant
### Build
Checkout [utils/README.md](utils/README.md) for details on building.

### License ###
### License
ros3djs is released with a BSD license. For full terms and conditions, see the [LICENSE](LICENSE) file.

### Authors ###
See the [AUTHORS](AUTHORS) file for a full list of contributors.
### Authors
See the [AUTHORS.md](AUTHORS) file for a full list of contributors.

Loading

0 comments on commit e36345f

Please sign in to comment.