Skip to content

Commit

Permalink
merge d3_refactor to master
Browse files Browse the repository at this point in the history
  • Loading branch information
kfarr committed Jan 4, 2017
2 parents 174a303 + 3dd9c3f commit 0fe4176
Show file tree
Hide file tree
Showing 1,550 changed files with 1,801,574 additions and 1,258 deletions.
12 changes: 8 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
## 0.0.8 - 2017-01-03
### Added
- tbd
- added support for loading object lists from json files instead of hardcoding in app
- removed d3 dependencies
- refactored object loading code
- new json_builder.js utility to create city builder compatible object lists in json format
- add all vehicle (veh) objects from mmmm

### Changed
- tbd
- changed directory structure, most things are now under assets

## Unversioned Release - 2017-01-01 and prior
## [Unversioned Releases] - 2017-01-01 and prior
### Added
- Added a changelog.
- Prior to the change log, all these things were added or changed:
Expand Down
21 changes: 12 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ A-Frame project demonstrating touch controls for building a VR city scene.
<strong><a href="https://kfarr.github.io/aframe-city-builder">If you have an HTC Vive or Oculus Rift with accompanying controllers, click here to try it out now!</a></strong>

## Screenshots
<img src="./images/screenshots.gif" />
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/images/screenshot1.png
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/images/screenshot2.png
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/images/screenshot3.png
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/images/screenshot4.png
<img src="./assets/images/screenshots.gif" />
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/assets/images/screenshot1.png
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/assets/images/screenshot2.png
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/assets/images/screenshot3.png
* https://raw.githubusercontent.com/kfarr/aframe-city-builder/master/assets/images/screenshot4.png

## wishlist
* load object list through json
* use ply objects instead of obj
* copy ada pictures to local project, ground mesh as well
* object type switching up / down
* use preview images for next/previous objects
* ui to go forward / backward through the json list
* try progressive enhancement to replace standard ply with baked ply after loading
* try out https://github.com/takahirox/aframe-outline component
* try progressive enhancement to replace obj with baked ply after loading
* try https://github.com/takahirox/aframe-outline component
* have a central registry of objects (json file is fine to start) that is not in index.html file ui inspiration - https://buffy.run/model/578e438962c6c80000ea4c5e
* support scroll right/left of objects via touch thumbstick/vive touchpad
* load new scenes without destroying original (load by appending) - does not handle collision case
* add some more fun placeable objects like pixel people and ufo's from <a href="https://github.com/mikelovesrobots/mmmm">mmmm</a>
* firebase or simple db storage for scenes in json or other format
* switch to all jquery and remove d3 dependency
Expand All @@ -32,9 +33,11 @@ A-Frame project demonstrating touch controls for building a VR city scene.
* highlight currently overlapping grid location
* cars to follow prescribed course on roads
* user generated objects / global object store
* add aframe snowplay type support https://github.com/rondagdag/aframe-snow-play
* persistent multiuser world
* use geolocation api to with virtual citybuilder locations to create "mini second life"
* physics
* add sunlight day cycle as aframe component http://jeromeetienne.github.io/threex.daynight/examples/basic.html
* try isometric view on mobile / non-vr devices (examples https://github.com/aframevr/aframe/issues/84 and http://wafi.iit.cnr.it/webvis/lab/preview.php?gist_id=07b5887a1d57b40b6065)

## Changelog
Expand Down
Binary file removed assets/.DS_Store
Binary file not shown.
Binary file removed assets/base-cross-street.png
Binary file not shown.
Binary file removed assets/base-grass.png
Binary file not shown.
Binary file removed assets/base-street.png
Binary file not shown.
File renamed without changes.
2 changes: 1 addition & 1 deletion assets/mesa.obj → assets/environment/table.obj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file uses centimeters as units for non-parametric coordinates.

mtllib mesa.mtl
mtllib table.mtl
g default
v -83.876795 -1.000000 42.036244
v 76.123205 -1.000000 42.036244
Expand Down
File renamed without changes
Binary file added assets/images/hamburger-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
26 changes: 26 additions & 0 deletions assets/kfarr_bases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"file": "base_grass1",
"scale": "0.01 0.01 0.01"
},
{
"file": "base_street1",
"scale": "0.01 0.01 0.01"
},
{
"file": "base_crossstreet",
"scale": "0.01 0.01 0.01"
},
{ "file": "scene_house6",
"scale": "0.00390625 0.00390625 0.00390625"
},
{ "file": "scene_house5",
"scale": "0.00390625 0.00390625 0.00390625"
},
{ "file": "scene_house2",
"scale": "0.00390625 0.00390625 0.00390625"
},
{ "file": "scene_park4",
"scale": "0.00390625 0.00390625 0.00390625"
}
]
142 changes: 142 additions & 0 deletions assets/mmmm_alien.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
[
{
"file": "alien_bot1",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_bot2",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_bot3",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_crawl1",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_crawl2",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_egg1",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_egg2",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_egg3",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi1a",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi1b",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi1c",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi2a",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi2b",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi2c",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi2d",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_engi3",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_eye1a",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_eye1b",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_eye1c",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_infected1",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_infected2",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_infected3",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_lift",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer1a",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer1b",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer1c",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer2a",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer2b",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer2c",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer3a",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer3b",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_saucer3c",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_tool1",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_tool2",
"scale": "0.005 0.005 0.005"
},
{
"file": "alien_tool3",
"scale": "0.005 0.005 0.005"
}
]
Loading

0 comments on commit 0fe4176

Please sign in to comment.