Skip to content

Commit

Permalink
new build path for v0.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
patriciogonzalezvivo committed Mar 16, 2016
1 parent f0bf6c4 commit 85248e8
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ You can use it directly from [editor.thebookofshaders.com](http://editor.thebook
<script type="text/javascript" src="https://rawgit.com/patriciogonzalezvivo/glslCanvas/master/build/GlslCanvas.min.js"></script>
```

Then is about including the two ```build``` files: ```css/main.css``` and ```js/glslEditor.js```:
Then is about including the two ```build``` files: ```glslEditor.css``` and ```glslEditor.js```:

```
<link type="text/css" rel="stylesheet" href="https://rawgit.com/patriciogonzalezvivo/glslEditor/gh-pages/build/css/main.css">
<script type="application/javascript" src="https://rawgit.com/patriciogonzalezvivo/glslEditor/gh-pages/build/js/glslEditor.js"></script>
<link type="text/css" rel="stylesheet" href="https://rawgit.com/patriciogonzalezvivo/glslEditor/gh-pages/build/glslEditor.css">
<script type="application/javascript" src="https://rawgit.com/patriciogonzalezvivo/glslEditor/gh-pages/build/glslEditor.js"></script>
```

And then you are ready to use it by passing an **DOM element** or **query selector string**, and a set of options;
Expand Down
1 change: 0 additions & 1 deletion build/css/main.css.map

This file was deleted.

2 changes: 1 addition & 1 deletion build/css/main.css → build/glslEditor.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/glslEditor.css.map

Large diffs are not rendered by default.

File renamed without changes.
6 changes: 3 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ gulp.task('css', function () {
reporter()
];

return gulp.src('./src/css/main.css')
return gulp.src('./src/css/glslEditor.css')
.pipe(plumber())
.pipe(sourcemaps.init())
.pipe(postcss(plugins))
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest('./build/css'))
.pipe(gulp.dest('./build'))
.pipe(livereload());
});

Expand Down Expand Up @@ -71,7 +71,7 @@ gulp.task('js', function () {
// .pipe(uglify())
// .on('error', gutil.log)
// .pipe(sourcemaps.write('.'))
.pipe(gulp.dest('./build/js'));
.pipe(gulp.dest('./build'));
});

// Rerun the task when a file changes
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<div id="glsl_editor"></div>
</body>

<link type="text/css" rel="stylesheet" href="build/css/main.css">
<script type="text/javascript" src="build/js/glslEditor.js"></script>
<link type="text/css" rel="stylesheet" href="build/glslEditor.css">
<script type="text/javascript" src="build/glslEditor.js"></script>
<script type="text/javascript">
window.glslEditor = new GlslEditor('#glsl_editor', {
canvas_size: 500,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "glslEditor",
"version": "0.0.1",
"version": "0.0.2",
"description": "Simple GLSL Fragment Shader Editor ",
"main": "index.js",
"scripts": {
Expand Down
File renamed without changes.

0 comments on commit 85248e8

Please sign in to comment.