Skip to content
This repository has been archived by the owner on Oct 20, 2020. It is now read-only.

Commit

Permalink
Updated website with new examples and some info
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordi Torres authored and Cedric Pinson committed Nov 3, 2015
1 parent b972bd1 commit 896fca0
Show file tree
Hide file tree
Showing 45 changed files with 113 additions and 185 deletions.
26 changes: 21 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,30 @@ OSGJS is a WebGL framework based on OpenSceneGraph concepts. It allows an indivi

The mailing list is available here: http://groups.google.com/group/osgjs

If you are interested in contributing, contact us on the IRC channels #webgl on Freenode, or by e-mail at [email protected]. Follow @trigrou on twitter to get news and update
If you are interested in contributing, contact us on the osgjs gitter channel ( https://gitter.im/cedricpinson/osgjs ) or on the IRC channel #osgjs on Freenode. Also by e-mail at [email protected]. Follow @trigrou on twitter to get news and updates.


How to build your own osgjs
----------------------------


First, clone a copy of the main git repo by running:


git clone git://github.com/cedricpinson/osgjs.git
cd osgjs
npm install # before you may need to npm install -g grunt-cli

Install required node dependencies:

npm install # before you may need to execute npm install -g grunt-cli ( using sudo if you are running linux )

Compile:

grunt build
Alternatively you can use webpack -d

Compile whenever watched files change:

grunt watch
Alternatively use webpack -w // faster than grunt watch because it uses webpack's incremental builds

The built version of osgjs will be put in the `build/` subdirectory.

Expand All @@ -38,7 +47,14 @@ Simply type in the command-line:

grunt serve

It should open a browser pointing to the examples directory.
It should open a browser pointing to the root source directory, then navigate to examples or tutorials folder.

Executing unitary tests
-----------------------

Launch:

grunt test

OpenSceneGraph osgjs plugin
----------------------------
Expand Down
Binary file removed website/assets/about.png
Binary file not shown.
Binary file removed website/assets/favicon.png
Binary file not shown.
Binary file removed website/assets/img/camera.jpg
Binary file not shown.
Binary file removed website/assets/img/camera_switch.jpg
Binary file not shown.
Binary file removed website/assets/img/cubemap.jpg
Binary file not shown.
Binary file removed website/assets/img/cubemotion.jpg
Binary file not shown.
Binary file removed website/assets/img/demojs-fff.jpg
Binary file not shown.
Binary file removed website/assets/img/fog.jpg
Binary file not shown.
Binary file removed website/assets/img/globetweeter.jpg
Binary file not shown.
Binary file removed website/assets/img/hdr.jpg
Binary file not shown.
Binary file removed website/assets/img/materials.jpg
Binary file not shown.
Binary file removed website/assets/img/nouvellevague.jpg
Binary file not shown.
Binary file removed website/assets/img/performance.jpg
Binary file not shown.
Binary file removed website/assets/img/picking.jpg
Binary file not shown.
Binary file removed website/assets/img/plod.jpg
Binary file not shown.
Binary file removed website/assets/img/pockerscene.jpg
Binary file not shown.
Binary file removed website/assets/img/pointcloud.jpg
Binary file not shown.
Binary file removed website/assets/img/pointcloudviz.jpg
Binary file not shown.
Binary file removed website/assets/img/postproc.jpg
Binary file not shown.
Binary file removed website/assets/img/shadow.jpg
Binary file not shown.
Binary file removed website/assets/img/sketchfab.jpg
Binary file not shown.
Binary file removed website/assets/img/ssao.jpg
Binary file not shown.
Binary file removed website/assets/img/terrain.jpg
Binary file not shown.
Binary file removed website/assets/img/veditor.jpg
Binary file not shown.
Binary file removed website/assets/logo.png
Binary file not shown.
138 changes: 0 additions & 138 deletions website/assets/screen.css

This file was deleted.

Binary file added website/web/contents/assets/img/animation.jpg
Binary file added website/web/contents/assets/img/dualcam.jpg
Binary file added website/web/contents/assets/img/earlyz.jpg
Binary file added website/web/contents/assets/img/gizmo.jpg
Binary file added website/web/contents/assets/img/ground.jpg
Binary file added website/web/contents/assets/img/lights.jpg
Binary file added website/web/contents/assets/img/scene-debug.jpg
Binary file added website/web/contents/assets/img/shadowmap.jpg
Binary file added website/web/contents/assets/img/text2D.jpg
119 changes: 85 additions & 34 deletions website/web/contents/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,9 @@
title: SDK Examples
samples:
-
title: Picking
image: assets/img/picking.jpg
link: examples/picking
-
title: Point Cloud
image: assets/img/pointcloud.jpg
link: examples/pointcloud
-
title: Cube Map
image: assets/img/cubemap.jpg
link: examples/cubemap
-
title: Poker Scene
image: assets/img/pockerscene.jpg
link: examples/pokerscene
-
title: Post Processing Shaders
image: assets/img/postproc.jpg
link: examples/postprocess
-
title: Shadow
image: assets/img/shadow.jpg
link: examples/shadow
-
title: SSAO
image: assets/img/ssao.jpg
link: examples/ssao
-
title: High Dynamic Range
image: assets/img/hdr.jpg
link: examples/hdr
title: Animation
image: assets/img/animation.jpg
link: examples/animation
-
title: Camera
image: assets/img/camera.jpg
Expand All @@ -46,21 +18,100 @@ samples:
title: Cube Motion
image: assets/img/cubemotion.jpg
link: examples/cubemotion
-
title: Cube Map
image: assets/img/cubemap.jpg
link: examples/cubemap
-
title: Dualcam
image: assets/img/dualcam.jpg
link: examples/dualcam
-
title: EarlyZ
image: assets/img/earlyz.jpg
link: examples/earlyz
-
title: Frustum Culling
image: assets/img/frustum-culling.jpg
link: examples/frustum-culling
-
title: High Dynamic Range
image: assets/img/hdr.jpg
link: examples/hdr
-
title: Fog
image: assets/img/fog.jpg
link: examples/fog
-
title: Gizmo
image: assets/img/gizmo.jpg
link: examples/gizmo
-
title: Ground
image: assets/img/ground.jpg
link: examples/ground
-
title: Lights
image: assets/img/lights.jpg
link: examples/lights
-
title: Materials
image: assets/img/materials.jpg
link: examples/materials
-
title: Performance
image: assets/img/performance.jpg
link: examples/performance
title: Multiple Viewers
image: assets/img/multipleviewers.jpg
link: examples/multipleviewers
-
title: PagedLOD
image: assets/img/plod.jpg
link: examples/pagedlod
-
title: Performance
image: assets/img/performance.jpg
link: examples/performance
-
title: Picking
image: assets/img/picking.jpg
link: examples/picking
-
title: Point Cloud
image: assets/img/pointcloud.jpg
link: examples/pointcloud
-
title: Poker Scene
image: assets/img/pockerscene.jpg
link: examples/pokerscene
-
title: Post Processing Shaders
image: assets/img/postproc.jpg
link: examples/postprocess
-
title: Scene Debug
image: assets/img/scene-debug.jpg
link: examples/scene-debug
-
title: Shader Generator
image: assets/img/shader-generator.jpg
link: examples/shader-generator
-
title: Shadowmap
image: assets/img/shadowmap.jpg
link: examples/shadowmap
-
title: Shadow
image: assets/img/shadow.jpg
link: examples/shadow
-
title: SSAO
image: assets/img/ssao.jpg
link: examples/ssao
-
title: Text 2D
image: assets/img/text2D.jpg
link: examples/text2D
-
title: Texture Video
image: assets/img/texture-video.jpg
link: examples/texture-video
---
2 changes: 1 addition & 1 deletion website/web/contents/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: OSG.JS - Javascript Implementation of OpenSceneGraph
template: index.html
github: http://github.com/cedricpinson/osgjs
download: https://github.com/cedricpinson/osgjs/zipball/master
download: https://github.com/cedricpinson/osgjs/archive/develop.zip
---

#OSG.JS
Expand Down
6 changes: 3 additions & 3 deletions website/web/contents/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
First, clone a copy of the main git repo by running:

git clone git://github.com/cedricpinson/osgjs.git
cd osgjs && ln -s build/dist build/active
npm install -g grunt-cli
cd osgjs
npm install -g grunt-cli ( Use sudo if using Linux )
npm install
grunt

The built version of osgjs will be put in the `build/` subdirectory.
The built version of osgjs will be put in the `builds/` subdirectory.
3 changes: 1 addition & 2 deletions website/web/contents/projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,5 @@ examples:
-
title: PointCloudViz
image: assets/img/pointcloudviz.jpg
link: http://server.pointcloudviz.com:9090
-
link: http://server.pointcloudviz.com
---
4 changes: 2 additions & 2 deletions website/web/contents/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Here is how you can get help from the community and contribute:
Join the Google Group http://groups.google.com/group/osgjs

###IRC
Join us on the #webgl channel on Freenode</p>
Join us on the #osgjs channel on Freenode

###E-mail
Reach us by sending an e-mail to [email protected]</p>
Reach us by sending an e-mail to [email protected]

###Twitter
Follow [@osgjs](http://twitter.com/osgjs) on Twitter.
Expand Down

0 comments on commit 896fca0

Please sign in to comment.