Skip to content

Commit

Permalink
oops
Browse files Browse the repository at this point in the history
  • Loading branch information
theo-armour committed Nov 1, 2015
1 parent a2f1821 commit ee27582
Show file tree
Hide file tree
Showing 5 changed files with 201 additions and 58 deletions.
File renamed without changes.
16 changes: 1 addition & 15 deletions home/r4/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[Jaanga]( index.html )
===

[[Copyright and License]( http://jaanga.github.io/#http://jaanga.github.io/jaanga-copyright-and-mit-license.md ) [Read Me]( http://jaanga.github.io/#http://jaanga.github.io/readme.md )
[Copyright and License]( http://jaanga.github.io/#http://jaanga.github.io/jaanga-copyright-and-mit-license.md ) ~ [Read Me]( http://jaanga.github.io/#http://jaanga.github.io/readme.md )

## Concept

Expand Down Expand Up @@ -115,20 +115,6 @@ Bugs on browsers other than Chrome need not be reported until such time as the w
Jaanga is a [GitHub]( http://github.com) [organization account]( https://help.github.com/articles/what-s-the-difference-between-user-and-organization-accounts ) and has multiple owners and admins.
All Jaanga scripts are [FOSS]( https://en.wikipedia.org/wiki/Free_and_open-source_software ).

Copyright © 2015 Jaanga authors

## License

Jaanga software is available under the [MIT License]( http://en.wikipedia.org/wiki/MIT_License) which states:

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.


## Change Log

Expand Down
19 changes: 17 additions & 2 deletions jaanga-copyright-and-mit-license.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<span style=display:none; >[You are now in a GitHub source code view - click this link to view this read me file as a web page]( http://jaanga.github.io/ "View file as a web page." ) </span>
<input type=button onclick=window.location.href='https://github.com/jaanga/jaanga.github.io/blob/master/jaanga-copyright-and-mit-license.md'; value='You are now in a GitHub web page view - Click this button to view this read me file as source code' />

[Jaanga]( http://jaanga.github.io ) »

Jaanga Copyright Notice and License
===================================
<br>
Expand All @@ -8,7 +13,7 @@ Jaanga Copyright Notice and License
[jaanga.github.io]( http://jaanga.github.io/ )
[github.com/jaanga]( https://github.com/jaanga/ )

Copyright &copy; 2014 Jaanga authors
Copyright © 2015 Jaanga authors

<br>

Expand All @@ -34,4 +39,14 @@ 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.

<br>
## Organization

Jaanga is a [GitHub]( http://github.com) [organization account]( https://help.github.com/articles/what-s-the-difference-between-user-and-organization-accounts ) and has multiple owners and admins.
All Jaanga scripts are [FOSS]( https://en.wikipedia.org/wiki/Free_and_open-source_software ).


<br>

<center title="dingbat" >
# <a href=javascript:window.scrollTo(0,0); style=text-decoration:none; >❦</a>
</center>
166 changes: 166 additions & 0 deletions readme-00.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
<span style=display:none; >[You are now in GitHub source code view - click this link to view Read Me file as a web page]( http://jaanga.github.io/ "View file as a web page." ) </span>
<input type=button onclick=window.location.href='https://github.com/jaanga/jaanga.github.io/'; value='You are now in GitHub web page view - Click this button to view Read Me file as source code' />

[Jaanga]( http://jaanga.github.io/ ) »

[Jaanga Read Me]( index.html )
===



The Jaanga Read Me - which is also the source of the web page document - is updated fairly frequently.
Click on one of the above links to go to the read me document for the current release.




<!--
_This read me is superseded_
## Concept
Jaanga is the home of a variety of 3D visualization apps that are generally based around the [Three.js]( http://threejs.org ) JavaScript 3D library - a collection of tools that greatly simplifies access to [WebGL]( http://en.wikipedia.org/wiki/WebGL ) API.
## Project Links
You have two ways of viewing the Jaanga files on GitHub:
* As web pages hosted on GitHub: [jaanga.github.io]( http://jaanga.github.io/ "view the files as apps." ) <input value="<< You are now probably here." size=28 style="font:bold 12pt monospace;border-width:0;" >
* As source code on GitHub: [github.com/jaanga]( https://github.com/jaanga/jaanga.github.io/ "View the files as source code." ) <scan style=display:none ><< You are now probably here.</scan>
## Notes
Everything here is [free and open source software]( http://en.wikipedia.org/wiki/Free_and_open-source_software 'free as in beer and free as in money' ).
All the source code for the apps is hosted and accessible via GitHub in public repositories.
Jaanga is a [GitHub Organization]( https://github.com/blog/674-introducing-organizations ) - which means that anybody may join and contribute.
The objective is that all the apps here should be useful to non-technical people and to entry-level programmers.
The intention is that all the apps run via an API and that simple tools are available to get going.
This repository is dedicated to [John Tukey]( http://en.wikipedia.org/wiki/John_Tukey ) for his vision in describing exploratory data analysis.
## Related GitHub Links
Apps that use Three.js and have the some of the same developers.
[aechack.github.io]( http://aechack.github.io/ )
[fgx.github.io]( http://fgx.github.io )
[theo-armour.github.io]( http://theo-armour.github.io/ )
## Outside Links
See also the blog at [jaanga.com](http://jaanga.com )
-->

## Copyright Notice and License
[ Copyright Notice and License ]( https://github.com/jaanga/jaanga.github.io/copyright-notice-and-license.md )

## Change Log

2013-11-15 ~ Continuing to polish things up.

2013-10-08 ~ Cookbook: many shiny new things

2013-08-30 ~ Gestification (Leap Motion): added Barfolina Pavilion

2013-08-27 ~ Cookbook: Added video-surfaces folders and files

2013-08-22 ~ Events: SF WebGL Meetup demo files added

2013-08-13 ~ Cookbook: Leap Motion Gestification folder added

2013-06-26 ~ jaanga.github.io: added menu items

2013-06-26 ~ Events: added SF WebGL 2013-06-26

2013-06-22 ~ Cookbook: added 'unFlatLand' R2

2013-06-19 ~ jaanga.github.io: added the sections

2013-06-15 ~ Cookbook: added 'unFlatLand' R1

2013-06-15 ~ Cookbook: added 'oSome Globe' R4

2013-06-13 ~ Uploaded the new bits to GitHub

2013-06-12 ~ Sketchbook: Added first sketch: 'xmlhttprequest2canvas'

2013-06-12 ~ Added Sketchbook section to Main Menu

2013-06-12 ~ Started this particular web site pivot


2013-03-10 ~ Theo

* Brain of Richard: added text and image to readme

2013-02-08 ~ Theo

* Strange clock with curve text is working
* Added info and links on Bain of Richard
* Enhancing style sheet to show headers better
* Adusting paths so that home page can call everything from folders - will make it easier to create new home pages and yet access older revisions
* updates sent to GitHub + plus a bunch of ongoing minor fixes

2013-02-06 ~ Theo

* Working on curved text.

2013-02-05 ~ Theo

* Brain of Richard: tidied a bit
* Exploring the issue that surfaces that morph shape don't update materials. Looks like quite a bit of research needed here
* Adding XY surface demmo to jaanga doctree.
* Adding read me files for jalape and xy surface.
* Update help/splash screen.

2013-02-04 ~ Theo

* DocTree: fixing image display
* Home page, Read Me: many additions
* Hauser Gallery Read Me: many additions
* Hauser Gallery: added several new equations that had been missed out
* Player: code clean up, has an API, works in docTree!
* docTree: supports query strings
* API app has better titling
* added images for new Hauser equationsm fixed screenCapture util some
* updated gallery files
* a lot of work on XY surface demo.


2013-02-01 ~ Theo

* Added alert for parser error messages
* builder: added help screen, added css
* Many other improvements

2013-01-31 ~ Theo

* Lots of improvements to builder

2013-01-30 ~ Theo

* docTree: displays images under heading, improved handling of ID tags
* folders/list.js: renumbering folders
* Builder: now operational

2013-01-29 ~ Theo

* this read me created
* adjusted scales to several surfaces in surfafaces.js
* algesurf-api: slider css much better/prettier
* Player.html: adding sliders, css and fixes etc to menu


<br>
<center><h2>&#x2766;</h2></center>


58 changes: 17 additions & 41 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,63 +1,39 @@
[Jaanga ~ Read Me]( index,html )
================
<span style=display:none; >[You are now in GitHub source code view - click this link to view Read Me file as a web page]( http://jaanga.github.io/ "View file as a web page." ) </span>
<input type=button onclick=window.location.href='https://github.com/jaanga/jaanga.github.io/'; value='You are now in GitHub web page view - Click this button to view Read Me file as source code' />

[Jaanga]( http://jaanga.github.io/ ) »

[Read Me R4 web page view]( http://jaanga.github.io/home/r4/ )
[Read Me R4 source code view]( https://github.com/jaanga/jaanga.github.io/tree/master/home/r4/ "View files with GitHub")
[Jaanga Read Me]( index.html )
===



The Jaanga Read Me - which is also the source of the web page document - is updated fairly frequently.
Click on one of the above links to go to the read me document for the current release.

<!--
_This read me is superseded_

## Concept
Jaanga is the home of a variety of 3D visualization apps that are generally based around the [Three.js]( http://threejs.org ) JavaScript 3D library - a collection of tools that greatly simplifies access to [WebGL]( http://en.wikipedia.org/wiki/WebGL ) API.
## Contacts

[email protected]

## Project Links
## System Requirements

You have two ways of viewing the Jaanga files on GitHub:
In order to view the files on this site you will need a device and browser that provides good support for [WebGL](http://get.webgl.org/).
WebGL is the JavaScript API for rendering interactive 3D graphics and 2D graphics within any compatible web browser without the use of plug-ins.

* As web pages hosted on GitHub: [jaanga.github.io]( http://jaanga.github.io/ "view the files as apps." ) <input value="<< You are now probably here." size=28 style="font:bold 12pt monospace;border-width:0;" >
* As source code on GitHub: [github.com/jaanga]( https://github.com/jaanga/jaanga.github.io/ "View the files as source code." ) <scan style=display:none ><< You are now probably here.</scan>
Generally this means a computer with an Intel Core i5 processor or better with an external GPU such as one made by Nvidia.
Successful use of the apps on a phone or tablet is highly unlikely.
A mouse or other pointing device with a scroll wheel is also highly recommended so that you can zoom, pant and rotate in 3D.

The apps here are currently being built and tested with the Google Chrome browser.
Bugs on browsers other than Chrome need not be reported until such time as the work settles down and an effort to support more browsers is initiated.

##Organization

## Notes
Jaanga is a [GitHub]( http://github.com) [organization account]( https://help.github.com/articles/what-s-the-difference-between-user-and-organization-accounts ) and has multiple owners and admins.
All Jaanga scripts are [FOSS]( https://en.wikipedia.org/wiki/Free_and_open-source_software ).


Everything here is [free and open source software]( http://en.wikipedia.org/wiki/Free_and_open-source_software 'free as in beer and free as in money' ).
All the source code for the apps is hosted and accessible via GitHub in public repositories.
Jaanga is a [GitHub Organization]( https://github.com/blog/674-introducing-organizations ) - which means that anybody may join and contribute.
The objective is that all the apps here should be useful to non-technical people and to entry-level programmers.
The intention is that all the apps run via an API and that simple tools are available to get going.
This repository is dedicated to [John Tukey]( http://en.wikipedia.org/wiki/John_Tukey ) for his vision in describing exploratory data analysis.
## Related GitHub Links
Apps that use Three.js and have the some of the same developers.
[aechack.github.io]( http://aechack.github.io/ )
[fgx.github.io]( http://fgx.github.io )
[theo-armour.github.io]( http://theo-armour.github.io/ )
## Outside Links
See also the blog at [jaanga.com](http://jaanga.com )
-->

## Copyright Notice and License
[ Copyright Notice and License ]( https://github.com/jaanga/jaanga.github.io/copyright-notice-and-license.md )

Expand Down

0 comments on commit ee27582

Please sign in to comment.