Merge branch 'master' of ghghgh.us:armory-fmf-cms

1 files changed, 5 insertions, 4 deletions

diff --git a/db.json b/db.json
index 3577abb..8ce3301 100644
--- a/db.json
+++ b/db.json
@@ -2455,10 +2455,11 @@
     {
       "id": "credits",
       "title": "Credits",
-      "body": "~ Herzog & de Meuron\r\nLuis Gisler\r\n\r\n~ Ai Weiwei Studio\r\nLucas Lai, Jennifer Schmachtenberg\r\nJennifer Ng, Darryl Leung, Hanno Hauenstein, Berit Gilma\r\n\r\n~ Drones provided and operated by\r\nPhotoFlight Aerial Media Services, LLC\r\n\r\n~ interactive playout system\r\niart\r\n\r\n~ Projection equipment\r\nPRG\r\n\r\n~ Sound equipment\r\nSound Associates\r\n\r\n~ Video monitors\r\nNew City Video\r\n\r\n~ Facial Recognition System\r\nAdam Harvey\r\n\r\n~ App Development\r\nJules LaPlace",
+      "body": "~ Herzog & de Meuron\r\nLuis Gisler\r\n\r\n~ Ai Weiwei Studio\r\nLucas Lai, Jennifer Schmachtenberg\r\nJennifer Ng, Darryl Leung\r\nAi Weiwei Studio\r\n\r\n~ Park Avenue Armory\r\n\r\n~ Drones provided and operated by\r\nPhotoFlight Aerial Media Services, LLC\r\n\r\n~ interactive playout system\r\niart\r\n\r\n~ Projection equipment\r\nPRG\r\n\r\n~ Sound equipment\r\nSound Associates\r\n\r\n~ Video monitors\r\nNew City Video\r\n\r\n~ Virtual Library Research\r\nHanno Hauenstein, Berit Gilma\r\n\r\n~ Facial Recognition System\r\nAdam Harvey\r\n\r\n~ App Development\r\nJules LaPlace",
       "disabled": false,
       "__index": 2,
-      "dateCreated": "Sat, 13 May 2017 19:49:53 GMT"
+      "dateCreated": "Sat, 13 May 2017 19:49:53 GMT",
+      "byline": ""
     },
     {
       "id": "privacy-policy",
@@ -2515,7 +2516,7 @@
     {
       "id": "floor-projections",
       "title": "Floor Projections",
-      "body": "Every movement in the Drill Hall is tracked and recorded from above by a grid of 56 small computers with infrared (IR) cameras, each attached to a projector suspended on a truss system high above the gently sloping floor . To allow for better tracking in low light conditions we installed an array of floodlights which operate in the near infrared spectrum and are thus is invisible to the human eye. Each computer runs a tracking algorithm that compares a preprogrammed image of the floor to the real time camera feed, and subtracts away any redundancy until only the difference features remain.  The moving person can thus be isolated, identified, and followed, which triggers a red rectangular outline and grid pattern to appear.  \r\n \r\nThe IR image now overlaid with tracking data undergoes a series of visual transformations. The powerful computers are able to make adjustments in cropping, scaling, warping, shifting, rotation, exposure, brightness, and sharpness, all within milliseconds.  Only then are the “real time” images sent to the projector.  The entirety of the 215 x 145 feet Drill Hall floor is covered by a total projection surface of 12360 x 7850 pixels, with each pixel being approximately ⅕ of an inch.  \r\n \r\nThe projections enable visitors to reflect upon the growing web of interconnected devices designed with ever evolving sensing capabilities and make tangible the reality that we leave digital traces almost everywhere.",
+      "body": "Every movement in the Drill Hall is tracked and recorded from above by a grid of 56 small computers with infrared (IR) cameras, each attached to a projector suspended on a truss system high above the gently sloping floor. To allow for better tracking in low light conditions we installed an array of floodlights which operate in the near infrared spectrum and are thus invisible to the human eye. Each computer runs a tracking algorithm that compares a preprogrammed image of the floor to the real time camera feed, and subtracts away any redundancy until only the difference features remain.  The moving person can thus be isolated, identified, and followed, which triggers a red rectangular outline and grid pattern to appear.  \r\n \r\nThe IR image now overlaid with tracking data undergoes a series of visual transformations. The powerful computers are able to make adjustments in cropping, scaling, warping, shifting, rotation, exposure, brightness, and sharpness, all within milliseconds.  Only then are the “real time” images sent to the projector.  The entirety of the 215 x 145 feet Drill Hall floor is covered by a total projection surface of 12360 x 7850 pixels, with each pixel being approximately ⅕ of an inch.  \r\n \r\nThe projections enable visitors to reflect upon the growing web of interconnected devices designed with ever evolving sensing capabilities and make tangible the reality that we leave digital traces almost everywhere.",
       "disabled": false,
       "__index": 3,
       "dateCreated": "Sat, 03 Jun 2017 19:11:30 GMT",
@@ -2567,7 +2568,7 @@
         },
         {
           "text": "Infrared Cameras",
-          "uri": "https://www.youtube.com/watch?v=Kvo-_JxCj20"
+          "uri": "https://youtu.be/adIZfkGDXAM"
         },
         {
           "text": "Drones",