diff --git a/.gitignore b/.gitignore index 108d7e1..ada7dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .vscode models/word.bin models/word.blend1 +models/infinity-symbol.blend1 +models/infinity-symbol.bin diff --git a/.gitignore b/.gitignore index 108d7e1..ada7dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .vscode models/word.bin models/word.blend1 +models/infinity-symbol.blend1 +models/infinity-symbol.bin diff --git a/models/infinity-symbol.blend b/models/infinity-symbol.blend new file mode 100644 index 0000000..b3bd41d --- /dev/null +++ b/models/infinity-symbol.blend Binary files differ diff --git a/.gitignore b/.gitignore index 108d7e1..ada7dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .vscode models/word.bin models/word.blend1 +models/infinity-symbol.blend1 +models/infinity-symbol.bin diff --git a/models/infinity-symbol.blend b/models/infinity-symbol.blend new file mode 100644 index 0000000..b3bd41d --- /dev/null +++ b/models/infinity-symbol.blend Binary files differ diff --git a/models/infinity-symbol.gltf b/models/infinity-symbol.gltf new file mode 100644 index 0000000..449a09a --- /dev/null +++ b/models/infinity-symbol.gltf @@ -0,0 +1,127 @@ +{ + "accessors" : [ + { + "bufferView" : 0, + "componentType" : 5123, + "count" : 4332, + "max" : [ + 2424 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 1, + "componentType" : 5126, + "count" : 2425, + "max" : [ + 0.08915139734745026, + 0.05407094955444336, + 0.0 + ], + "min" : [ + -0.08915139734745026, + -0.05407094955444336, + -0.027444569393992424 + ], + "type" : "VEC3" + }, + { + "bufferView" : 2, + "componentType" : 5126, + "count" : 2425, + "max" : [ + 0.9998992085456848, + 0.9999300837516785, + 1.0 + ], + "min" : [ + -0.9998992085456848, + -0.9999300837516785, + -1.0 + ], + "type" : "VEC3" + } + ], + "asset" : { + "generator" : "Khronos Blender glTF 2.0 exporter", + "version" : "2.0" + }, + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 8664, + "byteOffset" : 0, + "target" : 34963 + }, + { + "buffer" : 0, + "byteLength" : 29100, + "byteOffset" : 8664, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 29100, + "byteOffset" : 37764, + "target" : 34962 + } + ], + "buffers" : [ + { + "byteLength" : 66864, + "uri" : "infinity-symbol.bin" + } + ], + "materials" : [ + { + "name" : "infinityMaterial", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.0, + 0.04970656707882881, + 0.16826939582824707, + 1.0 + ], + "metallicFactor" : 0.0 + } + } + ], + "meshes" : [ + { + "name" : "Mesh", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 2, + "POSITION" : 1 + }, + "indices" : 0, + "material" : 0 + } + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "infinity", + "scale" : [ + 10.0, + 10.0, + 10.0 + ] + } + ], + "scene" : 0, + "scenes" : [ + { + "name" : "Scene", + "nodes" : [ + 0 + ] + } + ] +} diff --git a/.gitignore b/.gitignore index 108d7e1..ada7dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .vscode models/word.bin models/word.blend1 +models/infinity-symbol.blend1 +models/infinity-symbol.bin diff --git a/models/infinity-symbol.blend b/models/infinity-symbol.blend new file mode 100644 index 0000000..b3bd41d --- /dev/null +++ b/models/infinity-symbol.blend Binary files differ diff --git a/models/infinity-symbol.gltf b/models/infinity-symbol.gltf new file mode 100644 index 0000000..449a09a --- /dev/null +++ b/models/infinity-symbol.gltf @@ -0,0 +1,127 @@ +{ + "accessors" : [ + { + "bufferView" : 0, + "componentType" : 5123, + "count" : 4332, + "max" : [ + 2424 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 1, + "componentType" : 5126, + "count" : 2425, + "max" : [ + 0.08915139734745026, + 0.05407094955444336, + 0.0 + ], + "min" : [ + -0.08915139734745026, + -0.05407094955444336, + -0.027444569393992424 + ], + "type" : "VEC3" + }, + { + "bufferView" : 2, + "componentType" : 5126, + "count" : 2425, + "max" : [ + 0.9998992085456848, + 0.9999300837516785, + 1.0 + ], + "min" : [ + -0.9998992085456848, + -0.9999300837516785, + -1.0 + ], + "type" : "VEC3" + } + ], + "asset" : { + "generator" : "Khronos Blender glTF 2.0 exporter", + "version" : "2.0" + }, + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 8664, + "byteOffset" : 0, + "target" : 34963 + }, + { + "buffer" : 0, + "byteLength" : 29100, + "byteOffset" : 8664, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 29100, + "byteOffset" : 37764, + "target" : 34962 + } + ], + "buffers" : [ + { + "byteLength" : 66864, + "uri" : "infinity-symbol.bin" + } + ], + "materials" : [ + { + "name" : "infinityMaterial", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.0, + 0.04970656707882881, + 0.16826939582824707, + 1.0 + ], + "metallicFactor" : 0.0 + } + } + ], + "meshes" : [ + { + "name" : "Mesh", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 2, + "POSITION" : 1 + }, + "indices" : 0, + "material" : 0 + } + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "infinity", + "scale" : [ + 10.0, + 10.0, + 10.0 + ] + } + ], + "scene" : 0, + "scenes" : [ + { + "name" : "Scene", + "nodes" : [ + 0 + ] + } + ] +} diff --git a/public/index.js b/public/index.js index 550532b..5ac27e2 100644 --- a/public/index.js +++ b/public/index.js @@ -78,8 +78,8 @@ const loader = new THREE.GLTFLoader(); - const wordGLTF = await downloadModel(loader, "models/word.gltf"); - const word = wordGLTF.scene.children.find(c => c.name == "Text"); + const wordGLTF = await downloadModel(loader, "models/infinity-symbol.gltf"); + const word = wordGLTF.scene.children.find(c => c.name == "infinity"); word.castShadow = true; // word.receiveShadow = true; word.rotation.set(0,0,0); @@ -97,7 +97,7 @@ clonedWord = word.clone(false); clonedWord.position.set(randomScatter(),randomScatter(),randomScatter()); clonedWord.rotation.set(randomScatter(Math.PI),randomScatter(Math.PI),randomScatter(Math.PI)); - clonedWord.scale.set(0.15,0.15,0.15); + clonedWord.scale.set(1,1,1); wordGroup.add(clonedWord); wordCloud.push(clonedWord); } diff --git a/.gitignore b/.gitignore index 108d7e1..ada7dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .vscode models/word.bin models/word.blend1 +models/infinity-symbol.blend1 +models/infinity-symbol.bin diff --git a/models/infinity-symbol.blend b/models/infinity-symbol.blend new file mode 100644 index 0000000..b3bd41d --- /dev/null +++ b/models/infinity-symbol.blend Binary files differ diff --git a/models/infinity-symbol.gltf b/models/infinity-symbol.gltf new file mode 100644 index 0000000..449a09a --- /dev/null +++ b/models/infinity-symbol.gltf @@ -0,0 +1,127 @@ +{ + "accessors" : [ + { + "bufferView" : 0, + "componentType" : 5123, + "count" : 4332, + "max" : [ + 2424 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 1, + "componentType" : 5126, + "count" : 2425, + "max" : [ + 0.08915139734745026, + 0.05407094955444336, + 0.0 + ], + "min" : [ + -0.08915139734745026, + -0.05407094955444336, + -0.027444569393992424 + ], + "type" : "VEC3" + }, + { + "bufferView" : 2, + "componentType" : 5126, + "count" : 2425, + "max" : [ + 0.9998992085456848, + 0.9999300837516785, + 1.0 + ], + "min" : [ + -0.9998992085456848, + -0.9999300837516785, + -1.0 + ], + "type" : "VEC3" + } + ], + "asset" : { + "generator" : "Khronos Blender glTF 2.0 exporter", + "version" : "2.0" + }, + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 8664, + "byteOffset" : 0, + "target" : 34963 + }, + { + "buffer" : 0, + "byteLength" : 29100, + "byteOffset" : 8664, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 29100, + "byteOffset" : 37764, + "target" : 34962 + } + ], + "buffers" : [ + { + "byteLength" : 66864, + "uri" : "infinity-symbol.bin" + } + ], + "materials" : [ + { + "name" : "infinityMaterial", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.0, + 0.04970656707882881, + 0.16826939582824707, + 1.0 + ], + "metallicFactor" : 0.0 + } + } + ], + "meshes" : [ + { + "name" : "Mesh", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 2, + "POSITION" : 1 + }, + "indices" : 0, + "material" : 0 + } + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "infinity", + "scale" : [ + 10.0, + 10.0, + 10.0 + ] + } + ], + "scene" : 0, + "scenes" : [ + { + "name" : "Scene", + "nodes" : [ + 0 + ] + } + ] +} diff --git a/public/index.js b/public/index.js index 550532b..5ac27e2 100644 --- a/public/index.js +++ b/public/index.js @@ -78,8 +78,8 @@ const loader = new THREE.GLTFLoader(); - const wordGLTF = await downloadModel(loader, "models/word.gltf"); - const word = wordGLTF.scene.children.find(c => c.name == "Text"); + const wordGLTF = await downloadModel(loader, "models/infinity-symbol.gltf"); + const word = wordGLTF.scene.children.find(c => c.name == "infinity"); word.castShadow = true; // word.receiveShadow = true; word.rotation.set(0,0,0); @@ -97,7 +97,7 @@ clonedWord = word.clone(false); clonedWord.position.set(randomScatter(),randomScatter(),randomScatter()); clonedWord.rotation.set(randomScatter(Math.PI),randomScatter(Math.PI),randomScatter(Math.PI)); - clonedWord.scale.set(0.15,0.15,0.15); + clonedWord.scale.set(1,1,1); wordGroup.add(clonedWord); wordCloud.push(clonedWord); } diff --git a/style/favicon.svg b/style/favicon.svg index ed65d0c..12086cd 100644 --- a/style/favicon.svg +++ b/style/favicon.svg @@ -31,7 +31,7 @@ id="namedview14" showgrid="false" inkscape:zoom="2.555" - inkscape:cx="42.640483" + inkscape:cx="183.36595" inkscape:cy="100" inkscape:window-x="0" inkscape:window-y="27" @@ -69,19 +69,13 @@ - + id="text28"> + +