ghopp
/
webgl_tutorials
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Organize files somewhat

master
Georg Hopp 10 years ago
parent
ec49bf801a
commit
d8dd1126fd
12 changed files with 16 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 2
      css/main.css
  3. 6
      cube.html
  4. 0
      images/background1.jpg
  5. 0
      images/gravatar-256.jpg
  6. 2
      index.html
  7. 0
      js/cube.js
  8. 0
      js/gl-matrix-min.js
  9. 0
      js/square.js
  10. 3
      js/texture.js
  11. 6
      square.html
  12. 9
      texture.html

2
.gitignore
View File

@ -1,2 +1,4 @@
.*.sw?
Downloads/
toji*
Programming*

2
main.css → css/main.css
View File

@ -32,7 +32,7 @@
top: 0px;
width: 1920px;
height: 1200px;
background-image: url(./background1.jpg);
background-image: url(../images/background1.jpg);
padding: 0px;
margin: 0px;
z-index: -1;

6
cube.html
View File

@ -1,9 +1,9 @@
<html>
<head>
<title>Colored animated cube.</title>
<link rel="stylesheet" href="main.css">
<script src="gl-matrix-min.js" type="text/javascript"></script>
<script src="cube.js" type="text/javascript"></script>
<link rel="stylesheet" href="css/main.css">
<script type="text/javascript" src="js/gl-matrix-min.js"></script>
<script type="text/javascript" src="js/cube.js"></script>
<script id="cube-vertex-shader" type="x-shader/x-vertex">
attribute vec3 vertexPos;

0
background1.jpg → images/background1.jpg
View File

Side by Side Swipe Overlay

Before

Width: 1920  |  Height: 1200  |  Size: 890 KiB

After

Width: 1920  |  Height: 1200  |  Size: 890 KiB

0
gravatar-256.jpg → images/gravatar-256.jpg
View File

Side by Side Swipe Overlay

Before

Width: 256  |  Height: 256  |  Size: 79 KiB

After

Width: 256  |  Height: 256  |  Size: 79 KiB

2
index.html
View File

@ -1,7 +1,7 @@
<html>
<head>
<title> Oh my Gosh </title>
<link rel="stylesheet" href="main.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>

0
cube.js → js/cube.js
View File

0
gl-matrix-min.js → js/gl-matrix-min.js
View File

0
square.js → js/square.js
View File

3
texture.js → js/texture.js
View File

@ -38,8 +38,7 @@ function initTexture(gl) {
webGLTexture.image.onload = function () {
handleTextureLoaded(gl, webGLTexture)
}
//webGLTexture.image.src = "P3D/images/webgl-logo-256.jpg";
webGLTexture.image.src = "gravatar-256.jpg";
webGLTexture.image.src = "images/gravatar-256.jpg";
}
function initWebGL(canvas) {

6
square.html
View File

@ -1,9 +1,9 @@
<html>
<head>
<title>First very simple WebGL example...</title>
<link rel="stylesheet" href="main.css">
<script src="gl-matrix-min.js" type="text/javascript"></script>
<script src="square.js" type="text/javascript"></script>
<link rel="stylesheet" href="css/main.css">
<script type="text/javascript" src="js/gl-matrix-min.js"></script>
<script type="text/javascript" src="js/square.js"></script>
<script id="square-vertex-shader" type="x-shader/x-vertex">
attribute vec3 vertexPos;

9
texture.html
View File

@ -1,9 +1,9 @@
<html>
<head>
<title>My first animated and textured WebGL content.</title>
<link rel="stylesheet" href="main.css">
<script src="gl-matrix-min.js" type="text/javascript"></script>
<script src="texture.js" type="text/javascript"></script>
<link rel="stylesheet" href="css/main.css">
<script type="text/javascript" src="js/gl-matrix-min.js"></script>
<script type="text/javascript" src="js/texture.js"></script>
<script id="texture-vertex-shader" type="x-shader/x-vertex">
attribute vec3 vertexPos;
@ -13,7 +13,8 @@
varying vec2 vTexCoord;
void main(void) {
// Return the transformed and projected vertex value
gl_Position = projectionMatrix * modelViewMatrix * vec4(vertexPos, 1.0);
gl_Position =
projectionMatrix * modelViewMatrix * vec4(vertexPos, 1.0);
// Output the texture coordinate in vTexCoord
vTexCoord = texCoord;
}

Write Preview
Loading…
Cancel
Save