Skip to content

Duplication of library js files #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Duplication of library js files #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62cb456
moved common files to root
rhersen Mar 28, 2012
393afb9
removed lots of duplicate files
rhersen Mar 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Thumbs.db
*.blend1
.c9settings.xml
.c9settings.xml
.idea
Webgl-lessons.iml
4 changes: 2 additions & 2 deletions example02/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<title>Learning WebGL &mdash; Mandelbrot shader on a spinning cube</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">

<script type="text/javascript" src="glMatrix-0.9.5.min.js"></script>
<script type="text/javascript" src="webgl-utils.js"></script>
<script type="text/javascript" src="../glMatrix-0.9.5.min.js"></script>
<script type="text/javascript" src="../webgl-utils.js"></script>


<script id="color-shader-fs" type="x-shader/x-fragment">
Expand Down
0 example02/glMatrix-0.9.5.min.js → glMatrix-0.9.5.min.js
View file
Open in desktop
File renamed without changes.
32 changes: 0 additions & 32 deletions lesson01/glMatrix-0.9.5.min.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lesson01/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Learning WebGL &mdash; lesson 1</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">

<script type="text/javascript" src="glMatrix-0.9.5.min.js"></script>
<script type="text/javascript" src="../glMatrix-0.9.5.min.js"></script>

<script id="shader-fs" type="x-shader/x-fragment">
precision mediump float;
Expand Down
Loading