Skip to content

Commit

Permalink
jshint on globe
Browse files Browse the repository at this point in the history
  • Loading branch information
dschwen committed Jan 22, 2021
1 parent ce47eaf commit f1199eb
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions wmaglobe3d.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ function wmaGlobe3d(canvas,textureCanvas) {
function getShader(gl, id) {
var ss = $('#'+id), str = ss.text(), shader;

switch(ss.attr('type')) {
case "x-shader/x-fragment" :
switch(ss.attr('type')) {
case "x-shader/x-fragment" :
shader = gl.createShader(gl.FRAGMENT_SHADER);
break;
case "x-shader/x-vertex" :
Expand Down Expand Up @@ -123,12 +123,13 @@ function wmaGlobe3d(canvas,textureCanvas) {
var vertexPositionData = [];
var normalData = [];
var textureCoordData = [];
for (var latNumber=0; latNumber <= latitudeBands; latNumber++) {
var latNumber, longNumber;
for (latNumber = 0; latNumber <= latitudeBands; latNumber++) {
var theta = latNumber * Math.PI / latitudeBands;
var sinTheta = Math.sin(theta);
var cosTheta = Math.cos(theta);

for (var longNumber=0; longNumber <= longitudeBands; longNumber++) {
for (longNumber=0; longNumber <= longitudeBands; longNumber++) {
var phi = longNumber * 2 * Math.PI / longitudeBands;
var sinPhi = Math.sin(phi);
var cosPhi = Math.cos(phi);
Expand All @@ -151,8 +152,8 @@ function wmaGlobe3d(canvas,textureCanvas) {
}

var indexData = [];
for (var latNumber=0; latNumber < latitudeBands; latNumber++) {
for (var longNumber=0; longNumber < longitudeBands; longNumber++) {
for (latNumber = 0; latNumber < latitudeBands; latNumber++) {
for (longNumber = 0; longNumber < longitudeBands; longNumber++) {
var first = (latNumber * (longitudeBands + 1)) + longNumber;
var second = first + longitudeBands + 1;
indexData.push(first);
Expand Down Expand Up @@ -251,7 +252,7 @@ function wmaGlobe3d(canvas,textureCanvas) {
//alert("Could not initialise WebGL, sorry :-(");
return false;
}

if( !initShaders() ) {return false; }
initBuffers();
initTexture();
Expand All @@ -273,8 +274,8 @@ function wmaGlobe3d(canvas,textureCanvas) {
setLatLon : setLatLon,
updateTexture: updateTexture,
draw: drawScene
}
};
}

// export for closure compiler
window['wmaGlobe3d']=wmaGlobe3d;
window.wmaGlobe3d = wmaGlobe3d;

0 comments on commit f1199eb

Please sign in to comment.