Skip to content
Permalink
Browse files

Fixing shadows and Plane

  • Loading branch information...
Etienne Etienne
Etienne authored and Etienne committed Aug 4, 2017
1 parent 2a6610a commit 277b335ba3faf4fdcac06cee9cd2b8e768d5196b
@@ -1,11 +1,21 @@
# Hologram Framework
Beyond Wonderland.

[Visit Hologram.cool](https://hologram.cool)

# Documentation

[Documentation](https://hologram.cool/docs)
<h1 align="center">
<br>
<a href="https://hologram.cool">
<img src="extras/Hero@2x.png" alt="Hologram" width="256">
</a>
<br>
Hologram Framework
<br>
<br>
</h1>

<h2 align="center">All-in-one WebVR creation.</h2>
<h4 align="center"><a href="https://hologram.cool">Visit Hologram.cool</a></h4>

# Learn

- [Get Started with Hologram](https://hologram.cool/getstarted)
- [Documentation](https://hologram.cool/docs)

# Contribute

@@ -18,13 +28,12 @@ Beyond Wonderland.

###### Reporting Issues

- Please use the issue tracker
- Try to include an example and clearly describe expected behaviour

# Others
- [Twitter](https://twitter.com/hologram_cool) — Follow us for updates & the latest work
- [Latest builds](http://builds.hologram.cool/) — The latest builds of Hologram.js
- [The Newsletter](https://hologram.cool/newsletter/) — Get the best work & latest news in your inbox
- [Twitter](https://twitter.com/hologramcool) — Follow us for updates & the latest work
- [Latest builds](https://builds.hologram.cool/) — The latest builds of Hologram.js
- [The Newsletter](https://hologram.cool/newsletter/) — The latest Hologram news, articles and resources, sent straight to your inbox every month.

# About
Created by Etienne Pinchon (@etiennepinchon)
BIN +1.8 MB (120000%) build/Hologram.zip
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,57 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Hologram Builds</title>
<link rel="stylesheet" href="static/css/style.css">
</head>
<body>
<h1>Hologram Builds</h1>
<p>
These are builds for <a href="http://hologram.cool">Hologram</a>. Keep in mind that most of these are beta and some of them might be broken.
</p>
<table>
<tr>
<td><a href="https://github.com/etiennepinchon/Hologram/commit/2a6610a">2a6610a</a></td>
<td>Mon Jul 31 11:37:24 2017 +0200</td>
<td>Etienne</td>
<td><a href="/2a6610a/hologram.js">hologram.js</a></td>
<td><a href="/2a6610a/Hologram.zip">download</a></td>
</tr>
<tr>
<td><a href="https://github.com/etiennepinchon/Hologram/commit/ff825f7">ff825f7</a></td>
<td>Mon Jul 10 13:53:31 2017 +0200</td>
<td>Etienne</td>
<td><a href="/ff825f7/hologram.js">hologram.js</a></td>
<td><a href="/ff825f7/Hologram.zip">download</a></td>
</tr>
<tr>
<td><a href="https://github.com/etiennepinchon/Hologram/commit/b35ad52">b35ad52</a></td>
<td>Mon Jul 3 23:27:01 2017 +0200</td>
<td>Etienne</td>
<td><a href="/b35ad52/hologram.js">hologram.js</a></td>
<td><a href="/b35ad52/Hologram.zip">download</a></td>
</tr>
<tr>
<td><a href="https://github.com/etiennepinchon/Hologram/commit/ffe783f">ffe783f</a></td>
<td>Mon Jul 3 22:07:01 2017 +0200</td>
<td>Etienne</td>
<td><a href="/ffe783f/hologram.js">hologram.js</a></td>
<td><a href="/ffe783f/Hologram.zip">download</a></td>
</tr>
<tr>
<td><a href="https://github.com/etiennepinchon/Hologram/commit/95a5472">95a5472</a></td>
<td>Sun Jun 4 10:37:27 2017 +0200</td>
<td>Etienne</td>
<td><a href="/95a5472/hologram.js">hologram.js</a></td>
<td><a href="/95a5472/Hologram.zip">download</a></td>
</tr>
<tr>
<td><a href="https://github.com/etiennepinchon/Hologram/commit/8ef62a7">8ef62a7</a></td>
<td>Sat Jun 3 18:05:36 2017 +0200</td>
<td>Etienne</td>
<td><a href="/8ef62a7/hologram.js">hologram.js</a></td>
<td><a href="/8ef62a7/Hologram.zip">download</a></td>
</tr>
</table>
</body>
</html>
@@ -0,0 +1,7 @@
body {
font: 13px/1.35em Menlo;
}

td {
padding: 4px 12px;
}
@@ -0,0 +1,7 @@
body {
font: 13px/1.35em Menlo;
}

td {
padding: 4px 12px;
}
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,18 +1,18 @@
module.exports =
VENDORS: [
name: 'aframe'
path: 'https://raw.githubusercontent.com/aframevr/aframe/master/dist/aframe-master.min.js'
path: 'https://raw.githubusercontent.com/aframevr/aframe/master/dist/aframe-master.js'
,
name: 'aframe_gif_shader'
path: 'https://rawgit.com/mayognaise/aframe-gif-shader/master/dist/aframe-gif-shader.min.js'
path: 'https://rawgit.com/mayognaise/aframe-gif-shader/master/dist/aframe-gif-shader.js'
,
name: 'aframe_effects'
path: 'https://wizgrav.github.io/aframe-effects/dist/aframe-effects.min.js'
path: 'https://wizgrav.github.io/aframe-effects/dist/aframe-effects.js'
,
name: 'aframe_look_at'
path: 'https://raw.githubusercontent.com/ngokevin/kframe/master/components/look-at/dist/aframe-look-at-component.min.js'
path: 'https://raw.githubusercontent.com/ngokevin/kframe/master/components/look-at/dist/aframe-look-at-component.js'
,
name: 'aframe_mouse_cursor'
path: 'https://rawgit.com/mayognaise/aframe-mouse-cursor-component/master/dist/aframe-mouse-cursor-component.min.js'
path: 'https://rawgit.com/mayognaise/aframe-mouse-cursor-component/master/dist/aframe-mouse-cursor-component.js'
]
VENDORS_PATH: './vendors'
BIN +26.6 KB extras/Hero@2x.png
Binary file not shown.
@@ -94,10 +94,10 @@ gulp.task 'webpack:dev-server', (callback) ->
sourceMapFilename: "[file].map?hash=[hash]"
new webpackDevServer(webpack(_.clone(config)),
publicPath: __dirname+'/test/default/'
stats: colors: true).listen 8080, '192.168.0.24', (err) ->
stats: colors: true).listen 7070, '127.0.0.1', (err) ->
if err
throw new (gutil.PluginError)('webpack-dev-server', err)
log 'webpack-dev-server', 'http://localhost:8080/webpack-dev-server'
log 'webpack-dev-server', 'http://localhost:7070/webpack-dev-server'
return

#-------------------------------------------------------------------------------
@@ -12,6 +12,8 @@ cp -R extras/templates/Project build/Hologram/Project
mkdir -p build/Hologram/Project/hologram
cp dist/hologram.js build/Hologram/Project/hologram/hologram.js
cp dist/hologram.js.map build/Hologram/Project/hologram/hologram.js.map
cp dist/hologram.js build/hologram.js
cp dist/hologram.js.map build/hologram.js.map

# Clean up and zip the result
find build/Hologram -name ".DS_Store" -depth -exec rm {} \;
@@ -112,6 +112,8 @@ class exports.Entity extends BaseClass
@define "camera", entityAttribute("camera", "camera", null)
@define "lookAt", entityAttribute("lookAt", "look-at", null)
@define "link", entityAttribute("link", "link", null)
@define "shadow", entityAttribute("shadow", "shadow", no)
@define "castShadow", entityAttribute("castShadow", "cast-shadow", no)

# ----------------------------------------------------------------------------
# POSITION / ROTATION / SCALE
@@ -1,11 +1,36 @@
Utils = require "./Utils"
{entityAttribute, Entity} = require "./Entity"

AFRAME.registerPrimitive 'h-light',
defaultComponents: light: {}
mappings:
angle: 'light.angle'
color: 'light.color'
'ground-color': 'light.groundColor'
decay: 'light.decay'
distance: 'light.distance'
intensity: 'light.intensity'
penumbra: 'light.penumbra'
type: 'light.type'
target: 'light.target'
'cast-shadow': 'light.castShadow'
'shadow-bias': 'light.shadowBias'
'shadow-camera-far': 'light.shadowCameraFar'
'shadow-camera-fov': 'light.shadowCameraFov'
'shadow-camera-near': 'light.shadowCameraNear'
'shadow-camera-top': 'light.shadowCameraTop'
'shadow-camera-right': 'light.shadowCameraRight'
'shadow-camera-bottom': 'light.shadowCameraBottom'
'shadow-camera-left': 'light.shadowCameraLeft'
'shadow-camera-visible': 'light.shadowCameraVisible'
'shadow-map-height': 'light.shadowMapHeight'
'shadow-map-width': 'light.shadowMapWidth'

class Light extends Entity

entity :
name: "Light"
type: "a-light"
type: "h-light"

# ----------------------------------------------------------------------------
# PROPERTIES
@@ -16,7 +41,6 @@ class Light extends Entity
@define "intensity", entityAttribute("intensity", "intensity", 1)
@define "penumbra", entityAttribute("penumbra", "penumbra", 0)
@define "type", entityAttribute("type", "type", "directional")
@define "castShadow", entityAttribute("castShadow", "castShadow", no)

# Only works for Hemisphere light
@define "groundColor", entityAttribute("groundColor", "ground-color", "#FFF")
@@ -7,8 +7,8 @@ class exports.Plane extends Entity
type: "a-plane"

constructor: (options={})->
if not options.rotation or not options.rotationX
options.rotationX = -90
if not options.side then options.side = 'double'
if not options.rotation and not options.rotationX then options.rotationX = -90
super

# ----------------------------------------------------------------------------
@@ -7,9 +7,9 @@ class exports.Sky extends Entity
type: "a-sky"

constructor: (options)->
if not options.side then options.side = 'double'
super
@side = 'double'


# ----------------------------------------------------------------------------
# PROPERTIES

@@ -19,7 +19,6 @@
y: 3,
repeat: 10
})
new Line({
start: {x: 1},
end: {x: 4, y: 3, z: -2}
Oops, something went wrong.

0 comments on commit 277b335

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.