-
Notifications
You must be signed in to change notification settings - Fork 73
Video Reality – started #28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sarthaksrinivas
wants to merge
18
commits into
argonjs:develop
Choose a base branch
from
sarthaksrinivas:video-reality
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,405
−760
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
7d51396
Fix bug with test examples
27b2bcb
add skeleton method for isSupported
a8764f7
Create iframe and attach video element (not yet loading and displayin…
jv776 43134f4
don't need iframe
jv776 dea7d7e
Test for DOM environment before creating video element in LiveVideoRe…
jv776 405a3fc
Add check availability for live video
a81eec9
Display live camera (not yet complete)
d66b20d
Tested code and fixed some minor bugs
jv776 7309696
Display video in background of live video reality
jv776 d6a5490
Add jspmPackage flag back to package.json
jv776 a953e9e
Moved video element to argon div
jv776 faf4c8f
implemented getVideoFrame function to retrieve a frame of video (for …
jv776 dbbcca6
Signal frame state updates as video is played
jv776 3194fc0
Added very simple placeholder interface to set field of view and logi…
jv776 4ea9da7
FOV slider will receive pointer events; don't need to use cookie for …
jv776 af84da4
Use iframe to get field of view setting
jv776 ccd66b9
Use https in settings iframe source
jv776 c1a91a4
Merge branch 'develop' of https://github.com/argonjs/argon into video…
jv776 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,148 +1,148 @@ | ||
| { | ||
| "name": "@argonjs/argon", | ||
| "version": "1.1.0-beta", | ||
| "main": "dist/argon.js", | ||
| "typings": "index.d.ts", | ||
| "jspm": { | ||
| "format": "cjs", | ||
| "jspmPackage": true, | ||
| "dependencies": { | ||
| "cesium": "github:aelatgt/cesium@referenceFrames", | ||
| "aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0-beta.1.1.4", | ||
| "aurelia-polyfills": "npm:aurelia-polyfills@^1.0.0-beta.1.0.0", | ||
| "mobile-detect": "npm:mobile-detect@^1.3.2", | ||
| "ts": "github:frankwallis/plugin-typescript@^5.0.9", | ||
| "urijs": "github:medialize/URI.js@^1.18.1" | ||
| }, | ||
| "devDependencies": { | ||
| "chai": "npm:chai@^3.5.0", | ||
| "css": "github:systemjs/plugin-css@^0.1.19", | ||
| "mocha": "npm:mocha@^2.3.3" | ||
| }, | ||
| "peerDependencies": { | ||
| "aurelia-logging": "npm:aurelia-logging@^1.0.0-beta.1.1.1", | ||
| "aurelia-metadata": "npm:aurelia-metadata@^1.0.0-beta.1.1.3", | ||
| "aurelia-pal": "npm:aurelia-pal@^1.0.0-beta.1.1.1", | ||
| "os": "github:jspm/nodelibs-os@^0.2.0-alpha" | ||
| }, | ||
| "overrides": { | ||
| "npm:chai@3.5.0": { | ||
| "main": "index.js", | ||
| "format": "cjs", | ||
| "jspmPackage": true, | ||
| "meta": { | ||
| "*": { | ||
| "globals": { | ||
| "process": "process" | ||
| } | ||
| }, | ||
| "*.json": { | ||
| "format": "json" | ||
| }, | ||
| "chai.js": { | ||
| "cjsRequireDetection": false | ||
| } | ||
| }, | ||
| "map": { | ||
| "./lib/chai/utils": "./lib/chai/utils/index.js", | ||
| "process": "@empty" | ||
| } | ||
| }, | ||
| "npm:deep-eql@0.1.3": { | ||
| "main": "index.js", | ||
| "format": "cjs", | ||
| "meta": { | ||
| "*.json": { | ||
| "format": "json" | ||
| } | ||
| }, | ||
| "map": { | ||
| "buffer": "@empty" | ||
| } | ||
| }, | ||
| "npm:mobile-detect@1.3.2": { | ||
| "format": "cjs", | ||
| "jspmPackage": true, | ||
| "map": {} | ||
| }, | ||
| "npm:mocha@2.4.5": { | ||
| "browser": "mocha", | ||
| "main": "mocha", | ||
| "meta": { | ||
| "mocha.js": { | ||
| "deps": [ | ||
| "./mocha.css!" | ||
| ], | ||
| "exports": "mocha" | ||
| } | ||
| }, | ||
| "dependencies": { | ||
| "css": "*" | ||
| }, | ||
| "registry": "jspm" | ||
| }, | ||
| "github:aelatgt/cesium@referenceFrames": { | ||
| "registry": "github", | ||
| "dependencies": {}, | ||
| "map": { | ||
| "./Source/DataSources/BillboardGraphics": "@empty", | ||
| "./Source/DataSources/BoxGraphics": "@empty", | ||
| "./Source/DataSources/CorridorGraphics": "@empty", | ||
| "./Source/DataSources/CylinderGraphics": "@empty", | ||
| "./Source/DataSources/EllipseGraphics": "@empty", | ||
| "./Source/DataSources/EllipsoidGraphics": "@empty", | ||
| "./Source/DataSources/LabelGraphics": "@empty", | ||
| "./Source/DataSources/ModelGraphics": "@empty", | ||
| "./Source/DataSources/PathGraphics": "@empty", | ||
| "./Source/DataSources/PointGraphics": "@empty", | ||
| "./Source/DataSources/PolygonGraphics": "@empty", | ||
| "./Source/DataSources/PolylineGraphics": "@empty", | ||
| "./Source/DataSources/PolylineVolumeGraphics": "@empty", | ||
| "./Source/DataSources/RectangleGraphics": "@empty", | ||
| "./Source/DataSources/WallGraphics": "@empty" | ||
| } | ||
| }, | ||
| "npm:typescript@2.0.0": { | ||
| "browser": {}, | ||
| "map": { | ||
| "crypto": "@empty", | ||
| "buffer": "@empty", | ||
| "child_process": "@empty", | ||
| "fs": "@empty", | ||
| "path": "@empty", | ||
| "process": "@empty", | ||
| "readline": "@empty" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "format": "tsfmt -r", | ||
| "build:min": "jspm build src/argon.ts .tmp/argon-build.js --format umd --global-name Argon --skip-source-maps && derequire .tmp/argon-build.js > dist/argon.js", | ||
| "prebuild": "npm run build:min", | ||
| "build": "uglifyjs dist/argon.js -m -o dist/argon.min.js", | ||
| "browser-sync": "browser-sync start --server --directory --startPath \"index.html\" --files \"src/**\"", | ||
| "test": "npm run browser-sync", | ||
| "static": "static -p 3000", | ||
| "typedoc": "typedoc --tsconfig tsconfig.build.json --out docs --mode file --gaID UA-63191442-2 --name argon.js --readme src/README.md --target ES5 --module commonjs --experimentalDecorators --excludeNotExported --excludeExternals --ignoreCompilerErrors src", | ||
| "postinstall": "npm install types/cesium types/mobile-detect" | ||
| }, | ||
| "dependencies": { | ||
| "@types/urijs": "^1.15.26", | ||
| "aurelia-dependency-injection": "^1.0.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/chai": "^3.4.29", | ||
| "@types/mocha": "^2.2.28", | ||
| "@types/systemjs": "^0.18.27", | ||
| "browser-sync": "^2.11.0", | ||
| "derequire": "^2.0.3", | ||
| "jspm": "^0.17.0-beta.22", | ||
| "node-static": "^0.7.7", | ||
| "tsconfig-glob": "^0.2.1", | ||
| "typedoc": "^0.4.5", | ||
| "typescript": "^2.0.0", | ||
| "typescript-formatter": "^2.3.0", | ||
| "uglify-js": "^2.7.3" | ||
| } | ||
| } | ||
| { | ||
| "name": "@argonjs/argon", | ||
| "version": "1.1.0-beta", | ||
| "main": "dist/argon.js", | ||
| "typings": "index.d.ts", | ||
| "jspm": { | ||
| "format": "cjs", | ||
| "jspmPackage": true, | ||
| "dependencies": { | ||
| "cesium": "github:aelatgt/cesium@referenceFrames", | ||
| "aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0-beta.1.1.4", | ||
| "aurelia-polyfills": "npm:aurelia-polyfills@^1.0.0-beta.1.0.0", | ||
| "mobile-detect": "npm:mobile-detect@^1.3.2", | ||
| "ts": "github:frankwallis/plugin-typescript@^5.0.9", | ||
| "urijs": "github:medialize/URI.js@^1.18.1" | ||
| }, | ||
| "devDependencies": { | ||
| "chai": "npm:chai@^3.5.0", | ||
| "css": "github:systemjs/plugin-css@^0.1.19", | ||
| "mocha": "npm:mocha@^2.3.3" | ||
| }, | ||
| "peerDependencies": { | ||
| "aurelia-logging": "npm:aurelia-logging@^1.0.0-beta.1.1.1", | ||
| "aurelia-metadata": "npm:aurelia-metadata@^1.0.0-beta.1.1.3", | ||
| "aurelia-pal": "npm:aurelia-pal@^1.0.0-beta.1.1.1", | ||
| "os": "github:jspm/nodelibs-os@^0.2.0-alpha" | ||
| }, | ||
| "overrides": { | ||
| "npm:chai@3.5.0": { | ||
| "main": "index.js", | ||
| "format": "cjs", | ||
| "jspmPackage": true, | ||
| "meta": { | ||
| "*": { | ||
| "globals": { | ||
| "process": "process" | ||
| } | ||
| }, | ||
| "*.json": { | ||
| "format": "json" | ||
| }, | ||
| "chai.js": { | ||
| "cjsRequireDetection": false | ||
| } | ||
| }, | ||
| "map": { | ||
| "./lib/chai/utils": "./lib/chai/utils/index.js", | ||
| "process": "@empty" | ||
| } | ||
| }, | ||
| "npm:deep-eql@0.1.3": { | ||
| "main": "index.js", | ||
| "format": "cjs", | ||
| "meta": { | ||
| "*.json": { | ||
| "format": "json" | ||
| } | ||
| }, | ||
| "map": { | ||
| "buffer": "@empty" | ||
| } | ||
| }, | ||
| "npm:mobile-detect@1.3.2": { | ||
| "format": "cjs", | ||
| "jspmPackage": true, | ||
| "map": {} | ||
| }, | ||
| "npm:mocha@2.4.5": { | ||
| "browser": "mocha", | ||
| "main": "mocha", | ||
| "meta": { | ||
| "mocha.js": { | ||
| "deps": [ | ||
| "./mocha.css!" | ||
| ], | ||
| "exports": "mocha" | ||
| } | ||
| }, | ||
| "dependencies": { | ||
| "css": "*" | ||
| }, | ||
| "registry": "jspm" | ||
| }, | ||
| "github:aelatgt/cesium@referenceFrames": { | ||
| "registry": "github", | ||
| "dependencies": {}, | ||
| "map": { | ||
| "./Source/DataSources/BillboardGraphics": "@empty", | ||
| "./Source/DataSources/BoxGraphics": "@empty", | ||
| "./Source/DataSources/CorridorGraphics": "@empty", | ||
| "./Source/DataSources/CylinderGraphics": "@empty", | ||
| "./Source/DataSources/EllipseGraphics": "@empty", | ||
| "./Source/DataSources/EllipsoidGraphics": "@empty", | ||
| "./Source/DataSources/LabelGraphics": "@empty", | ||
| "./Source/DataSources/ModelGraphics": "@empty", | ||
| "./Source/DataSources/PathGraphics": "@empty", | ||
| "./Source/DataSources/PointGraphics": "@empty", | ||
| "./Source/DataSources/PolygonGraphics": "@empty", | ||
| "./Source/DataSources/PolylineGraphics": "@empty", | ||
| "./Source/DataSources/PolylineVolumeGraphics": "@empty", | ||
| "./Source/DataSources/RectangleGraphics": "@empty", | ||
| "./Source/DataSources/WallGraphics": "@empty" | ||
| } | ||
| }, | ||
| "npm:typescript@2.0.0": { | ||
| "browser": {}, | ||
| "map": { | ||
| "crypto": "@empty", | ||
| "buffer": "@empty", | ||
| "child_process": "@empty", | ||
| "fs": "@empty", | ||
| "path": "@empty", | ||
| "process": "@empty", | ||
| "readline": "@empty" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "format": "tsfmt -r", | ||
| "build:min": "jspm build src/argon.ts .tmp/argon-build.js --format umd --global-name Argon --skip-source-maps && derequire .tmp/argon-build.js > dist/argon.js", | ||
| "prebuild": "npm run build:min", | ||
| "build": "uglifyjs dist/argon.js -m -o dist/argon.min.js", | ||
| "browser-sync": "browser-sync start --server --directory --startPath \"index.html\" --files \"src/**\"", | ||
| "test": "npm run browser-sync", | ||
| "static": "static -p 3000", | ||
| "typedoc": "typedoc --tsconfig tsconfig.build.json --out docs --mode file --gaID UA-63191442-2 --name argon.js --readme src/README.md --target ES5 --module commonjs --experimentalDecorators --excludeNotExported --excludeExternals --ignoreCompilerErrors src", | ||
| "postinstall": "npm install types/cesium types/mobile-detect" | ||
| }, | ||
| "dependencies": { | ||
| "@types/urijs": "^1.15.26", | ||
| "aurelia-dependency-injection": "^1.0.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/chai": "^3.4.29", | ||
| "@types/mocha": "^2.2.28", | ||
| "@types/systemjs": "^0.18.27", | ||
| "browser-sync": "^2.11.0", | ||
| "derequire": "^2.0.3", | ||
| "jspm": "^0.17.0-beta.22", | ||
| "node-static": "^0.7.7", | ||
| "tsconfig-glob": "^0.2.1", | ||
| "typedoc": "^0.4.5", | ||
| "typescript": "^2.0.0", | ||
| "typescript-formatter": "^2.3.0", | ||
| "uglify-js": "^2.7.3" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this
jspmPackageflag removed?