Permalink
Browse files

Updates

  • Loading branch information...
Etienne Etienne
Etienne authored and Etienne committed Jul 31, 2017
1 parent ff825f7 commit 2a6610ae3ebfc2a0dd5e80aa0d4de31a04a4d93c
Showing with 5,044 additions and 4,108 deletions.
  1. +1 −0 .gitignore
  2. +3 −1 Makefile
  3. BIN build/Hologram.zip
  4. +41 −0 build/Hologram/Project/app.js
  5. +26 −0 build/Hologram/Project/index.html
  6. +0 −8 build/Version.coffee
  7. +0 −63 docs/1_Intro.md
  8. +0 −141 docs/Animation.md
  9. +0 −29 docs/Assets.md
  10. +0 −209 docs/Box.md
  11. +0 −115 docs/Camera.md
  12. +0 −131 docs/Circle.md
  13. +0 −178 docs/Cone.md
  14. +0 −64 docs/Cursor.md
  15. +0 −159 docs/CurvedImage.md
  16. +0 −199 docs/Cylinder.md
  17. +0 −166 docs/Dodecahedron.md
  18. +0 −64 docs/Effects.md
  19. +0 −257 docs/Entity.md
  20. +0 −111 docs/HandControls.md
  21. +0 −37 docs/Icosahedron.md
  22. +0 −60 docs/Image.md
  23. +0 −118 docs/Light.md
  24. +0 −46 docs/Line.md
  25. +0 −38 docs/Link.md
  26. +0 −36 docs/Model.md
  27. +0 −37 docs/Octahedron.md
  28. +0 −132 docs/Plane.md
  29. +0 −156 docs/Ring.md
  30. +0 −61 docs/Scene.md
  31. +0 −18 docs/Screenshots.md
  32. +0 −44 docs/Sky.md
  33. +0 −68 docs/Sound.md
  34. +0 −199 docs/Sphere.md
  35. +0 −37 docs/Tetrahedron.md
  36. +0 −158 docs/Text.md
  37. +0 −76 docs/Torus.md
  38. +0 −86 docs/TorusKnot.md
  39. +0 −44 docs/Triangle.md
  40. +0 −296 docs/Utils.md
  41. +0 −74 docs/Video.md
  42. +0 −54 docs/VideoSphere.md
  43. +15 −14 gulpfile.coffee
  44. +4,457 −0 package-lock.json
  45. +2 −2 package.json
  46. +2 −2 scripts/dist.sh
  47. +2 −2 scripts/site_builder.coffee
  48. +38 −2 src/Animation.coffee
  49. +1 −1 src/Box.coffee
  50. +1 −1 src/Camera.coffee
  51. +1 −1 src/Circle.coffee
  52. +1 −1 src/ColladaModel.coffee
  53. +1 −1 src/Color.coffee
  54. +1 −1 src/Cone.coffee
  55. +8 −8 src/Context.coffee
  56. +2 −2 src/Cursor.coffee
  57. +1 −1 src/CurvedImage.coffee
  58. +1 −1 src/Cylinder.coffee
  59. +1 −1 src/DOMEventManager.coffee
  60. +1 −1 src/Dodecahedron.coffee
  61. +109 −16 src/Entity.coffee
  62. +1 −1 src/GltfModel.coffee
  63. +16 −11 src/Hologram.coffee
  64. +1 −1 src/Icosahedron.coffee
  65. +1 −1 src/Image.coffee
  66. +1 −1 src/Light.coffee
  67. +14 −6 src/Line.coffee
  68. +5 −2 src/ObjectModel.coffee
  69. +1 −1 src/Octahedron.coffee
  70. +6 −1 src/Plane.coffee
  71. +11 −4 src/{Link.coffee → Portal.coffee}
  72. +1 −1 src/Ring.coffee
  73. +5 −5 src/Scene.coffee
  74. +2 −2 src/Sky.coffee
  75. +2 −2 src/Sound.coffee
  76. +1 −1 src/Sphere.coffee
  77. +1 −1 src/Tetrahedron.coffee
  78. +1 −1 src/Text.coffee
  79. +1 −1 src/Torus.coffee
  80. +1 −1 src/TorusKnot.coffee
  81. +1 −1 src/Triangle.coffee
  82. +23 −10 src/Utils.coffee
  83. +0 −19 src/Values.coffee
  84. +1 −1 src/Video.coffee
  85. +1 −1 src/VideoSphere.coffee
  86. +30 −0 test/index.html
  87. +198 −202 vendors/aframe.js
  88. +1 −1 vendors/aframe_look_at.js
  89. +1 −1 vendors/aframe_mouse_cursor.js
@@ -28,3 +28,4 @@ _projects
node_modules
dist/
vendors/
scripts/
@@ -17,7 +17,7 @@ unbootstrap:
clean:
rm -rf vendors
rm -rf build
rm -rf dist
rm -Rf node_modules
clearvendors:
@@ -51,7 +51,9 @@ dist: release
scripts/dist.sh
predeploy: dist
. ../Pipeline/env.sh; \
scripts/site_builder.sh
deploy: predeploy
. ../Pipeline/env.sh; \
$(BIN)/coffee scripts/site_builder.coffee upload
BIN +1.58 KB build/Hologram.zip
Binary file not shown.
@@ -0,0 +1,41 @@
// Welcome to Hologram
// This is just demo code. Feel free to delete it all.
Hologram.ready(function() {
var myBox = new Box({
position: '-1 0.5 -3',
rotation: '0 45 0',
width: 1,
height: 1,
depth: 1,
color: '#4CC3D9'
});
var mySphere = new Sphere({
position: '1 1.25 -5',
radius: 1.25,
color: '#EF2D5E',
segmentsWidth: 100,
segmentsHeight: 100
});
var myCyclinder = new Cylinder({
position: '1 0.75 -3',
radius: .5,
height: 1.5,
color: '#FFC65D'
});
var myPlane = new Plane({
position: '0 0 -4',
rotation: '-90 0 0',
width: 4,
height: 4,
color: '#7BC8A4'
});
var mySky = new Sky({
color: '#ECECEC'
});
})
@@ -0,0 +1,26 @@
<html>
<head>
<title>Hologram</title>
<meta charset="utf-8">
<style type="text/css" media="screen">
* {
margin:0;
padding:0;
border:none;
-webkit-user-select:none;
}
body {
background: black;
color: #FFF;
overflow: hidden;
}
a {
color: #bfbfbf;
}
</style>
</head>
<body>
<script src="hologram/hologram.js"></script>
<script src="app.js"></script>
</body>
</html>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 2a6610a

Please sign in to comment.