diff --git a/Assets/Website/index.html.meta b/Assets/Website/index.html.meta deleted file mode 100644 index 5b66ba4..0000000 --- a/Assets/Website/index.html.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1006689567576dc4ba3e610b5f29b209 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Website/index.html b/Assets/Website~/index.html similarity index 95% rename from Assets/Website/index.html rename to Assets/Website~/index.html index 6fe88c1..ec5bfc4 100644 --- a/Assets/Website/index.html +++ b/Assets/Website~/index.html @@ -1,7 +1,7 @@ - three.js - kinect + Holoprojection browser endpoint +
+ - diff --git a/Assets/Website/projection.frag.glsl b/Assets/Website~/projection.frag.glsl similarity index 100% rename from Assets/Website/projection.frag.glsl rename to Assets/Website~/projection.frag.glsl diff --git a/Assets/Website/projection.vert.glsl b/Assets/Website~/projection.vert.glsl similarity index 95% rename from Assets/Website/projection.vert.glsl rename to Assets/Website~/projection.vert.glsl index 946e1fd..e98daae 100644 --- a/Assets/Website/projection.vert.glsl +++ b/Assets/Website~/projection.vert.glsl @@ -55,7 +55,7 @@ void main() { vec4 pos = vec4( ( position.x / width - 0.5 )*boxSize, ( position.y / height - 0.5 )*boxSize, - (-1.0)*z*boxSize*0.5, // we applied a (-1.0) multiplier to try to flip element [2,2] + z*boxSize*0.5, // we had applied a (-1.0) multiplier to try to flip element [2,2] 1.0); //vec4 pos2 = pos; vec4 pos2 = c2wm * pos;