Skip to content
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

Fixed #25

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

Fixed #25

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
842f5d5
Update files
Jan 9, 2017
d74e13f
Corrupt or malware
Seagat2011 Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 4 additions & 3 deletions chapter-06/05-extrude-svg.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
<!-- Javascript code that runs our Three.js examples -->
<script type="text/javascript">

var svgString = document.querySelector("#batman-path").getAttribute("d");

var orbit;

// once everything is loaded, we run our Three.js stuff.
Expand Down Expand Up @@ -127,14 +129,13 @@
gui.add(controls, 'bevelEnabled').onChange(controls.asGeom);
gui.add(controls, 'curveSegments', 1, 30).step(1).onChange(controls.asGeom);
gui.add(controls, 'steps', 1, 5).step(1).onChange(controls.asGeom);

controls.asGeom();
render();

function drawShape() {


var svgString = document.querySelector("#batman-path").getAttribute("d");
//var svgString = attribute_d;//document.querySelector("#batman-path").getAttribute("d");

var shape = transformSVGPathExposed(svgString);

Expand Down
14 changes: 9 additions & 5 deletions chapter-07/06-rainy-scene.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<!DOCTYPE html>

<!--
BUGFIX
1. THREE.ParticleSystem(geom, material) => THREE.PointCloud(geom, material)
2. THREE.ParticleBasicMaterial(geom, material) => THREE.PointCloudMaterial(geom, material)
3. THREE.ImageUtils.loadTexture("../assets/textures/particles/raindrop-3.png") => THREE.ImageUtils.loadTexture("assets/textures/particles/raindrop-3.png"); // browser blocks non PWD XSS; firefox FIX only
-->
<html>

<head>
Expand All @@ -18,7 +23,6 @@
</style>
</head>
<body>

<div id="Stats-output">
</div>
<!-- Div which will hold the Output -->
Expand Down Expand Up @@ -86,10 +90,10 @@

function createPointCloud(size, transparent, opacity, sizeAttenuation, color) {

var texture = THREE.ImageUtils.loadTexture("../assets/textures/particles/raindrop-3.png");
var texture = THREE.ImageUtils.loadTexture("assets/textures/particles/raindrop-3.png");
var geom = new THREE.Geometry();

var material = new THREE.ParticleBasicMaterial({
var material = new THREE.PointCloudMaterial({//THREE.ParticleBasicMaterial({
size: size,
transparent: transparent,
opacity: opacity,
Expand All @@ -111,7 +115,7 @@
geom.vertices.push(particle);
}

cloud = new THREE.ParticleSystem(geom, material);
cloud = new THREE.PointCloud(geom, material);//THREE.ParticleSystem(geom, material);
cloud.sortParticles = true;

scene.add(cloud);
Expand Down
16 changes: 11 additions & 5 deletions chapter-07/07-snowy-scene.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<!DOCTYPE html>

<!--
BUGFIX
1. THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake1.png") => THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake1.png")
2. THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake2.png") => THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake2.png")
3. THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake3.png") => THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake3.png")
4. THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake5.png") => THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake5.png")
-->
<html>

<head>
Expand Down Expand Up @@ -128,10 +134,10 @@

function createPointClouds(size, transparent, opacity, sizeAttenuation, color) {

var texture1 = THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake1.png");
var texture2 = THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake2.png");
var texture3 = THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake3.png");
var texture4 = THREE.ImageUtils.loadTexture("../assets/textures/particles/snowflake5.png");
var texture1 = THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake1.png");//loadTexture("../assets/textures/particles/snowflake1.png");
var texture2 = THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake2.png");//loadTexture("../assets/textures/particles/snowflake2.png");
var texture3 = THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake3.png");//loadTexture("../assets/textures/particles/snowflake3.png");
var texture4 = THREE.ImageUtils.loadTexture("assets/textures/particles/snowflake5.png");//loadTexture("../assets/textures/particles/snowflake5.png");

scene.add(createPointCloud("system1", texture1, size, transparent, opacity, sizeAttenuation, color));
scene.add(createPointCloud("system2", texture2, size, transparent, opacity, sizeAttenuation, color));
Expand Down
6 changes: 5 additions & 1 deletion chapter-07/08-sprites.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<!DOCTYPE html>
<!--
BUGFIX
1. THREE.ImageUtils.loadTexture("../assets/textures/particles/sprite-sheet.png") => THREE.ImageUtils.loadTexture("assets/textures/particles/sprite-sheet.png")
-->

<html>

Expand Down Expand Up @@ -61,7 +65,7 @@
scene.add(mesh);

var getTexture = function () {
var texture = new THREE.ImageUtils.loadTexture("../assets/textures/particles/sprite-sheet.png");
var texture = new THREE.ImageUtils.loadTexture("assets/textures/particles/sprite-sheet.png");//loadTexture("../assets/textures/particles/sprite-sheet.png");
return texture;
};

Expand Down
6 changes: 5 additions & 1 deletion chapter-07/09-sprites-3D.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<!DOCTYPE html>
<!--
BUGFIX
1. THREE.ImageUtils.loadTexture("../assets/textures/particles/sprite-sheet.png") => THREE.ImageUtils.loadTexture("assets/textures/particles/sprite-sheet.png")
-->

<html>

Expand Down Expand Up @@ -71,7 +75,7 @@


function getTexture() {
var texture = new THREE.ImageUtils.loadTexture("../assets/textures/particles/sprite-sheet.png");
var texture = new THREE.ImageUtils.loadTexture("assets/textures/particles/sprite-sheet.png");
return texture;
}

Expand Down
9 changes: 9 additions & 0 deletions chapter-07/BUGFIX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FIXED:
06-rainy-scene.html
07-snowy-scene.html
08-sprites.html
09-sprites-3D.html

BUG:
-Tutorials (APIs/calls) were out of date
-WebGL block XSS image loads; should devise workaround (save import files in Present-Working-Directory (PWD) ) (firefox FIX only)
Binary file added chapter-07/assets/textures/particles/raindrop-3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added chapter-07/assets/textures/particles/snowflake1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added chapter-07/assets/textures/particles/snowflake2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added chapter-07/assets/textures/particles/snowflake3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added chapter-07/assets/textures/particles/snowflake5.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added chapter-07/assets/textures/particles/sprite-sheet.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 30 additions & 2 deletions chapter-08/05-blender-from-json.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
<!DOCTYPE html>
<!--
BUGFIX
1.

loader.load('assets/models/misc_chair01.js', function (geometry, mat) {
mesh = new THREE.Mesh(geometry, mat[0]);

mesh.scale.x = 15;
mesh.scale.y = 15;
mesh.scale.z = 15;

scene.add(mesh);

}, '../assets/models/');

=>


loader.load('assets/models/misc_chair01.js', function (geometry, mat) {
mesh = new THREE.Mesh(geometry, mat[0]);

mesh.scale.x = 15;
mesh.scale.y = 15;
mesh.scale.z = 15;

scene.add(mesh);

}, 'assets/models/');
-->
<html>

<head>
Expand Down Expand Up @@ -75,7 +103,7 @@
var mesh;

var loader = new THREE.JSONLoader();
loader.load('../assets/models/misc_chair01.js', function (geometry, mat) {
loader.load('assets/models/misc_chair01.js', function (geometry, mat) {
mesh = new THREE.Mesh(geometry, mat[0]);

mesh.scale.x = 15;
Expand All @@ -84,7 +112,7 @@

scene.add(mesh);

}, '../assets/models/');
}, 'assets/models/');


render();
Expand Down
7 changes: 5 additions & 2 deletions chapter-08/06-load-obj.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load('../assets/models/pinecone.obj' => loader.load('assets/models/pinecone.obj'
-->
<html>

<head>
Expand Down Expand Up @@ -77,7 +80,7 @@
var mesh;

var loader = new THREE.OBJLoader();
loader.load('../assets/models/pinecone.obj', function (loadedMesh) {
loader.load('assets/models/pinecone.obj', function (loadedMesh) {
var material = new THREE.MeshLambertMaterial({color: 0x5C3A21});

// loadedMesh is a group of meshes. For
Expand Down
7 changes: 5 additions & 2 deletions chapter-08/07-load-obj-mtl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load('../assets/models/butterfly.obj', '../assets/models/butterfly.mtl' => loader.load('assets/models/butterfly.obj', 'assets/models/butterfly.mtl'
-->
<html>

<head>
Expand Down Expand Up @@ -79,7 +82,7 @@

var loader = new THREE.OBJMTLLoader();

loader.load('../assets/models/butterfly.obj', '../assets/models/butterfly.mtl', function (object) {
loader.load('assets/models/butterfly.obj', 'assets/models/butterfly.mtl', function (object) {

// configure the wings
var wing2 = object.children[5].children[0];
Expand Down
7 changes: 5 additions & 2 deletions chapter-08/08-load-collada.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/dae/Truck_dae.dae" => loader.load("assets/models/dae/Truck_dae.dae"
-->
<html>

<head>
Expand Down Expand Up @@ -64,7 +67,7 @@
var loader = new THREE.ColladaLoader();

var mesh;
loader.load("../assets/models/dae/Truck_dae.dae", function (result) {
loader.load("assets/models/dae/Truck_dae.dae", function (result) {
mesh = result.scene.children[0].children[0].clone();
mesh.scale.set(4, 4, 4);
scene.add(mesh);
Expand Down
7 changes: 5 additions & 2 deletions chapter-08/09-load-stl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/SolidHead_2_lowPoly_42k.stl" => loader.load("assets/models/SolidHead_2_lowPoly_42k.stl"
-->
<html>

<head>
Expand Down Expand Up @@ -77,7 +80,7 @@
// model from http://www.thingiverse.com/thing:69709
var loader = new THREE.STLLoader();
var group = new THREE.Object3D();
loader.load("../assets/models/SolidHead_2_lowPoly_42k.stl", function (geometry) {
loader.load("assets/models/SolidHead_2_lowPoly_42k.stl", function (geometry) {
console.log(geometry);
var mat = new THREE.MeshLambertMaterial({color: 0x7777ff});
group = new THREE.Mesh(geometry, mat);
Expand Down
9 changes: 6 additions & 3 deletions chapter-08/10-load-ctm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/auditt_wheel.ctm" => loader.load("assets/models/auditt_wheel.ctm"
-->
<html>

<head>
<title>Example 08.10 - Load pdb model </title>
<title>Example 08.10 - Load ctm model </title>
<script type="text/javascript" src="../libs/three.js"></script>
<script type="text/javascript" src="../libs/CTMLoader.js"></script>
<script type="text/javascript" src="../libs/ctm.js"></script>
Expand Down Expand Up @@ -73,7 +76,7 @@
var loader = new THREE.CTMLoader();
var group = new THREE.Object3D();

loader.load("../assets/models/auditt_wheel.ctm", function (geometry) {
loader.load("assets/models/auditt_wheel.ctm", function (geometry) {
var mat = new THREE.MeshLambertMaterial({color: 0xff8888});
group = new THREE.Mesh(geometry, mat);
group.scale.set(20, 20, 20);
Expand Down
9 changes: 6 additions & 3 deletions chapter-08/11-load-vtk.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/moai_fixed.vtk" => loader.load("assets/models/moai_fixed.vtk"
-->
<html>

<head>
<title>Example 08.11 - Load pdb model </title>
<title>Example 08.11 - Load vtk model </title>
<script type="text/javascript" src="../libs/three.js"></script>
<script type="text/javascript" src="../libs/VTKLoader.js"></script>

Expand Down Expand Up @@ -76,7 +79,7 @@

var loader = new THREE.VTKLoader();
var group = new THREE.Object3D();
loader.load("../assets/models/moai_fixed.vtk", function (geometry) {
loader.load("assets/models/moai_fixed.vtk", function (geometry) {
var mat = new THREE.MeshLambertMaterial({color: 0xaaffaa});
group = new THREE.Mesh(geometry, mat);
group.scale.set(9, 9, 9);
Expand Down
7 changes: 5 additions & 2 deletions chapter-08/12-load-pdb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/aspirin.pdb" => loader.load("assets/models/aspirin.pdb"
-->
<html>

<head>
Expand Down Expand Up @@ -87,7 +90,7 @@

var loader = new THREE.PDBLoader();
var group = new THREE.Object3D();
loader.load("../assets/models/aspirin.pdb", function (geometry, geometryBonds) {
loader.load("assets/models/aspirin.pdb", function (geometry, geometryBonds) {
// loader.load("../assets/models/diamond.pdb", function (geometry, geometryBonds) {
var i = 0;

Expand Down
7 changes: 5 additions & 2 deletions chapter-08/13-load-PLY.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/test.ply" => loader.load("assets/models/test.ply"
-->
<html>

<head>
Expand Down Expand Up @@ -76,7 +79,7 @@

var loader = new THREE.PLYLoader();
var group = new THREE.Object3D();
loader.load("../assets/models/test.ply", function (geometry) {
loader.load("assets/models/test.ply", function (geometry) {
var material = new THREE.PointCloudMaterial({
color: 0xffffff,
size: 0.4,
Expand Down
9 changes: 6 additions & 3 deletions chapter-08/14-load-awd.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/awd/PolarBear.awd" => loader.load("assets/models/awd/PolarBear.awd"
-->
<html>

<head>
<title>Example 08.11 - Load pdb model </title>
<title>Example 08.14 - Load awd model </title>
<script type="text/javascript" src="../libs/three.js"></script>
<script type="text/javascript" src="../libs/AWDLoader.js"></script>

Expand Down Expand Up @@ -92,7 +95,7 @@

var loader = new THREE.AWDLoader();
var group = new THREE.Object3D();
loader.load("../assets/models/awd/PolarBear.awd", function (model) {
loader.load("assets/models/awd/PolarBear.awd", function (model) {

console.log(model);

Expand Down
7 changes: 5 additions & 2 deletions chapter-08/15-load-assimp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE html>

<!--
BUGFIX
1. loader.load("../assets/models/assimp/spider.obj.assimp.json" => loader.load("assets/models/assimp/spider.obj.assimp.json"
-->
<html>

<head>
Expand Down Expand Up @@ -92,7 +95,7 @@

var loader = new THREE.AssimpJSONLoader();
var group = new THREE.Object3D();
loader.load("../assets/models/assimp/spider.obj.assimp.json", function (model) {
loader.load("assets/models/assimp/spider.obj.assimp.json", function (model) {

console.log(model);

Expand Down
Loading