Skip to content
Browse files

Merge branch 'master' of github.com:ashima/gloc into 1.0

  • Loading branch information...
2 parents 431e5f6 + 38ce041 commit 4e00fcc323b8f4bf1da5cbbc780790f32d6d4fe2 @dsheets dsheets committed
Showing with 12 additions and 12 deletions.
  1. +4 −4 README.md
  2. +8 −8 doc/blog/announce.html
View
8 README.md
@@ -14,9 +14,9 @@ shader systems. *gloc 1.0* features:
- runs as a native binary and in-the-browser via js_of_ocaml
*gloc* is distributed as source code via this repository as well as a
- [compiled JavaScript tool](http://ashimagroup.net/gloc/glocode/). *glol*, the
+ [compiled JavaScript tool](http://ashimaarts.com/gloc/glocode/). *glol*, the
*glo* linking algorithm, is [also
- available](http://ashimagroup.net/gloc/glol.js) for your development convenience.
+ available](http://ashimaarts.com/gloc/glol.js) for your development convenience.
*gloc* is licensed under a
[BSD-3-Clause](https://github.com/ashima/gloc/blob/master/LICENSE)
@@ -105,8 +105,8 @@ concerns, just ask! :-)
### WebGL Application Developers
WebGL application developers need only to use the [JavaScript *glol*
-link algorithm](http://ashimagroup.net/gloc/glol.js) and the
-[glocode](http://ashimagroup.net/gloc/glocode/) development
+link algorithm](http://ashimaarts.com/gloc/glol.js) and the
+[glocode](http://ashimaarts.com/gloc/glocode/) development
environment. No local software installation is required.
### Shader Developers
View
16 doc/blog/announce.html
@@ -15,7 +15,7 @@
<p>Hello, World Wide Web! This is David Sheets, co-founder of Ashima Arts,
coming to you in living hypermedia.</p>
<p>I am pleased to announce the first release
-of <a class="glow" href="http://ashimagroup.net/gloc/">gloc</a>, a
+of <a class="glow" href="http://ashimaarts.com/gloc/">gloc</a>, a
precision-crafted toolkit for WebGL and OpenGL ES2 GLSL
shaders. gloc
enables authors to easily unlock the power and creative potential of
@@ -47,7 +47,7 @@
<h3>How <span class="glow">gloc</span> works:</h3>
<table style="text-align: center">
- <tr><td><img src="http://ashimagroup.net/gloc/gloc_pipeline.png"
+ <tr><td><img src="http://ashimaarts.com/gloc/gloc_pipeline.png"
alt="gloc pipeline: gloc transforms ES SL into glo object files
which are subsequently linked with other glo resources using glol to produce WebGL
shaders"/>
@@ -76,16 +76,16 @@
<p>The result of this scope analysis and a minimally modified
reserialization of the source is then packaged into a simple JSON
format, <a class="glow"
- href="http://ashimagroup.net/gloc/#glo">glo</a>. The <span class="glow">glo</span>
+ href="http://ashimaarts.com/gloc/#glo">glo</a>. The <span class="glow">glo</span>
format we have designed makes accurate linking as easy as possible
with a concise linking algorithm, <a class="glow"
- href="http://ashimagroup.net/gloc/#glol">glol</a>. <span class="glow">glo</span>
+ href="http://ashimaarts.com/gloc/#glol">glol</a>. <span class="glow">glo</span>
includes support for link maps indicating the location of each linked
source fragment to aid debugging. Also included is optional
hyperlinked authorship metadata declaring the copyright holder,
author, license, library, version, and build. We recommend
transporting <span class="glow">glo</span> shader libraries in
- the <a class="glow" href="http://ashimagroup.net/gloc/#glom">glom</a>
+ the <a class="glow" href="http://ashimaarts.com/gloc/#glom">glom</a>
manifest format which provides an ordered, named, hierarchical JSON
structure around each
<span class="glow">glo</span>
@@ -97,7 +97,7 @@
<p>Finally, the generated <span class="glow">glo</span> files may be
linked back into valid shader programs
by <span class="glow">gloc</span> or a simple JavaScript
- linker, <a href="http://ashimagroup.net/gloc/glol.js">glol.js</a>,
+ linker, <a href="http://ashimaarts.com/gloc/glol.js">glol.js</a>,
included with <a href="https://github.com/ashima/gloc/">the
distribution</a>. The linking algorithm takes a list of symbols to be
satisfied (['main'] by default) and a search path
@@ -106,9 +106,9 @@
</p>
<h3>Where <span class="glow">gloc</span> lives:</h3>
<p>The source code for the <a class="glow"
- href="http://ashimagroup.net/gloc/">gloc</a> suite version 1.0.0 has
+ href="http://ashimaarts.com/gloc/">gloc</a> suite version 1.0.0 has
been released under the BSD 3-Clause license
- on <a href="https://github.com/ashima/gloc/">GitHub</a>. A <a href="http://ashimagroup.net/gloc/glocode/">Web
+ on <a href="https://github.com/ashima/gloc/">GitHub</a>. A <a href="http://ashimaarts.com/gloc/glocode/">Web
interface</a> is immediately available.
</p>
<p>We heartily welcome community contributions and look forward to

0 comments on commit 4e00fcc

Please sign in to comment.
Something went wrong with that request. Please try again.