diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..91a6ead --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +mangler.mp4 diff --git a/environment.hdr b/environment.hdr new file mode 100644 index 0000000..3a71a5c Binary files /dev/null and b/environment.hdr differ diff --git a/index.html b/index.html new file mode 100644 index 0000000..4a5f91e --- /dev/null +++ b/index.html @@ -0,0 +1,72 @@ + + + + + iris von gerkzeuk + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ + + diff --git a/iris_puzzles.css b/iris_puzzles.css index ea0fce3..90782e1 100644 --- a/iris_puzzles.css +++ b/iris_puzzles.css @@ -25,6 +25,7 @@ body { z-index: -100; } +<<<<<<< HEAD #curtain{ position:absolute; top:0px; @@ -36,6 +37,8 @@ body { height:100%; } +======= +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af #video-bg{ position: absolute; top: 0; diff --git a/iris_puzzles.gltf b/iris_puzzles.gltf index 003ee89..54fcb7d 100644 --- a/iris_puzzles.gltf +++ b/iris_puzzles.gltf @@ -1064,7 +1064,11 @@ "uri" : "human_female_specular.jpg" }, { +<<<<<<< HEAD "uri" : "env.jpg" +======= + "uri" : "environment.hdr" +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af } ], "materials" : [ @@ -1669,12 +1673,17 @@ "nodeGraph" : { "edges" : [ { +<<<<<<< HEAD "fromNode" : 3, +======= + "fromNode" : 4, +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af "fromOutput" : 0, "toInput" : 0, "toNode" : 0 }, { +<<<<<<< HEAD "fromNode" : 2, "fromOutput" : 0, "toInput" : 7, @@ -1685,10 +1694,23 @@ "fromOutput" : 0, "toInput" : 1, "toNode" : 6 +======= + "fromNode" : 3, + "fromOutput" : 0, + "toInput" : 7, + "toNode" : 1 + }, + { + "fromNode" : 5, + "fromOutput" : 0, + "toInput" : 1, + "toNode" : 7 +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af }, { "fromNode" : 7, "fromOutput" : 0, +<<<<<<< HEAD "toInput" : 0, "toNode" : 1 }, @@ -1703,6 +1725,22 @@ "fromOutput" : 0, "toInput" : 5, "toNode" : 7 +======= + "toInput" : 5, + "toNode" : 1 + }, + { + "fromNode" : 1, + "fromOutput" : 0, + "toInput" : 0, + "toNode" : 2 + }, + { + "fromNode" : 0, + "fromOutput" : 0, + "toInput" : 0, + "toNode" : 1 +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af } ], "nodes" : [ @@ -1725,6 +1763,77 @@ { "inputs" : [ [ +<<<<<<< HEAD +======= + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1.0 + ], + 0.0, + [ + 1.0, + 0.20000000298023224, + 0.10000000149011612 + ], + [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1.0 + ], + 0.0, + 0.00909090880304575, + 0.0, + 0.5, + 0.0, + 0.0, + 0.0, + 0.5, + 0.0, + 0.029999999329447746, + 1.4500000476837158, + 0.0, + 0.0, + [ + 0.0, + 0.0, + 0.0, + 1.0 + ], + 1.0, + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] + ], + "is_active_output" : false, + "name" : "Principled BSDF", + "outputs" : [ + [ + 0, + 0, + 0, + 0 + ] + ], + "type" : "BSDF_PRINCIPLED" + }, + { + "inputs" : [ + [ +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af 0, 0, 0, @@ -1848,6 +1957,7 @@ ], "type" : "MATH", "useClamp" : false +<<<<<<< HEAD }, { "inputs" : [ @@ -1916,6 +2026,8 @@ ] ], "type" : "BSDF_PRINCIPLED" +======= +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af } ] } @@ -1935,6 +2047,15 @@ "toNode" : 1 }, { +<<<<<<< HEAD +======= + "fromNode" : 4, + "fromOutput" : 0, + "toInput" : 1, + "toNode" : 2 + }, + { +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af "fromNode" : 3, "fromOutput" : 0, "toInput" : 0, @@ -1945,12 +2066,15 @@ "fromOutput" : 0, "toInput" : 0, "toNode" : 0 +<<<<<<< HEAD }, { "fromNode" : 4, "fromOutput" : 0, "toInput" : 1, "toNode" : 2 +======= +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af } ], "nodes" : [ @@ -2572,10 +2696,17 @@ { "extensions" : { "S8S_v3d_texture_data" : { +<<<<<<< HEAD "colorSpace" : "srgb" } }, "name" : "env.jpg", +======= + "colorSpace" : "linear" + } + }, + "name" : "environment.hdr", +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af "sampler" : 0, "source" : 4 } diff --git a/iris_puzzles.js b/iris_puzzles.js index 206e226..b1372ba 100644 --- a/iris_puzzles.js +++ b/iris_puzzles.js @@ -43,17 +43,24 @@ function loadScene(sceneURL, initOptions) { var ctxSettings = {}; if (initOptions.useBkgTransp) ctxSettings.alpha = true; if (initOptions.preserveDrawBuf) ctxSettings.preserveDrawingBuffer = true; +<<<<<<< HEAD /* +======= + +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af var preloader = initOptions.useCustomPreloader ? createCustomPreloader(initOptions.preloaderProgressCb, initOptions.preloaderEndCb) : new v3d.SimplePreloader({ container: 'container' }); +<<<<<<< HEAD */ var preloader = new v3d.SimplePreloader({ container: 'container' }); //preloader.background.style.opacity = 0; preloader.background.style.backgroundColor = 'black'; preloader.background.style.textColor = 'white'; +======= +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af var app = new v3d.App('container', ctxSettings, preloader); if (initOptions.useBkgTransp) { diff --git a/visual_logic.js b/visual_logic.js index 1f5f885..d571c23 100644 --- a/visual_logic.js +++ b/visual_logic.js @@ -1,6 +1,10 @@ /** * Generated by Verge3D Puzzles v.2.12.5 +<<<<<<< HEAD * Mon Jun 10 2019 15:45:13 GMT+0200 (Mitteleuropäische Sommerzeit) +======= + * Mon Jun 10 2019 05:49:05 GMT+0200 (Mitteleuropäische Sommerzeit) +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af * Do not edit this file - your changes may get overridden when Puzzles are saved. * Refer to https://www.soft8soft.com/docs/manual/en/introduction/Using-JavaScript.html * for information on how to add your own JavaScript to Verge3D apps. @@ -91,6 +95,7 @@ PL.execInitPuzzles = function() { preloaderEndCb: function() {}, } } +<<<<<<< HEAD // utility functions envoked by the HTML puzzles function getElements(ids, isParent) { @@ -147,12 +152,16 @@ function setHTMLElemStyle(prop, value, ids, isParent) { // initSettings puzzle +======= + // initSettings puzzle +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af _initGlob.output.initOptions.fadeAnnotations = true; _initGlob.output.initOptions.useBkgTransp = true; _initGlob.output.initOptions.preserveDrawBuf = false; _initGlob.output.initOptions.useCompAssets = false; _initGlob.output.initOptions.useFullscreen = false; +<<<<<<< HEAD // initPreloader puzzle _initGlob.output.initOptions.useCustomPreloader = true; @@ -172,6 +181,8 @@ _initGlob.output.initOptions.preloaderEndCb = function() { (function() {})(); }; +======= +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af return _initGlob.output; } @@ -195,7 +206,23 @@ function bloom(threshold, strength, radius) { +<<<<<<< HEAD bloom(0.4, 0.15, 0.2); +======= +// callJSFunction puzzle +function getJSFunction(funcName) { + var jsFunc = appInstance.ExternalInterface[funcName]; + if (typeof jsFunc == "function") + return jsFunc; + else + return function() {}; +} + + + +bloom(0.4, 0.25, 0.2); +getJSFunction('startVideo')(); +>>>>>>> 83c2b9870597ee999f38d78b893a91a035ffe4af } // end of PL.init function