From 2d2a4cf0386a00ff0a4bc4519b1f4302f9f5dea4 Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Sun, 10 Dec 2017 12:29:29 -0800
Subject: [PATCH] Rename data to resources;

---
 CONTRIBUTING.md                     |   4 +-
 README.md                           |   2 +-
 src/data/boot.lua                   | 223 ----------------------------
 src/loaders/font.c                  |   2 +-
 src/lovr.c                          |   4 +-
 src/{data => resources}/Cabin.ttf   | Bin
 src/{data => resources}/Cabin.ttf.h |   0
 src/{data => resources}/boot.lua.h  |   0
 src/{data => resources}/logo.png    | Bin
 src/{data => resources}/logo.png.h  |   0
 10 files changed, 6 insertions(+), 229 deletions(-)
 delete mode 100644 src/data/boot.lua
 rename src/{data => resources}/Cabin.ttf (100%)
 rename src/{data => resources}/Cabin.ttf.h (100%)
 rename src/{data => resources}/boot.lua.h (100%)
 rename src/{data => resources}/logo.png (100%)
 rename src/{data => resources}/logo.png.h (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5a6920e5..e4ca6665 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ submitting.  Try to stick to the existing coding style:
 If you modify the embedded `boot.lua` script, you can compile it into a C header by doing this:
 
 ```sh
-pushd src/data; xxd -i boot.lua > boot.lua.h; popd
+pushd src/resources; xxd -i boot.lua > boot.lua.h; popd
 ```
 
 Organization
@@ -48,6 +48,6 @@ An overview of the folder structure:
 in the `src/lib` folder.
 - `src/api` contains Lua bindings.  There's a file for each module in there, and a `types` folder
 with a file for each type of object.
-- `src/data` contains embedded resources.  These are compiled to binary headers using `xxd`.
+- `src/resources` contains embedded resources.  These are compiled to binary headers using `xxd`.
 - `src/loaders` has stuff for loading various file formats into LÖVR data structures.
 - Each module has a folder in `src`.
diff --git a/README.md b/README.md
index 8ef35a5a..aa1804e0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><a href="http://lovr.org"><img src="src/data/logo.png" width="160"></a></p>
+<p align="center"><a href="http://lovr.org"><img src="src/resources/logo.png" width="160"></a></p>
 
 <h1 align="center">LÖVR</h1>
 
diff --git a/src/data/boot.lua b/src/data/boot.lua
deleted file mode 100644
index 7172e3b9..00000000
--- a/src/data/boot.lua
+++ /dev/null
@@ -1,223 +0,0 @@
-local conf = {
-  modules = {
-    audio = true,
-    event = true,
-    graphics = true,
-    headset = true,
-    math = true,
-    physics = true,
-    timer = true
-  },
-  gammacorrect = false,
-  headset = {
-    drivers = { 'openvr', 'webvr', 'fake' },
-    mirror = true,
-    offset = 1.7
-  },
-  window = {
-    width = 800,
-    height = 600,
-    fullscreen = false,
-    msaa = 0,
-    title = 'LÖVR',
-    icon = nil
-  }
-}
-
-local function applyHeadsetOffset()
-  lovr.graphics.translate('view', 0, -conf.headset.offset, 0)
-end
-
-function lovr.errhand(message)
-  message = 'Error:\n' .. message:gsub('\n[^\n]+$', ''):gsub('\t', ''):gsub('stack traceback', '\nStack')
-  print(message)
-  if not lovr.graphics then return end
-  lovr.graphics.reset()
-  lovr.graphics.setBackgroundColor(.105, .098, .137)
-  lovr.graphics.setColor(.863, .863, .863)
-  if lovr.headset then
-    lovr.headset.setMirrored(false)
-  end
-  local font = lovr.graphics.getFont()
-  local pixelDensity = font:getPixelDensity()
-  local width = font:getWidth(message, .55 * pixelDensity)
-  local function render()
-    lovr.graphics.print(message, -width / 2, conf.headset.offset, -20, 1, 0, 0, 0, 0, .55 * pixelDensity, 'left')
-  end
-  local function headsetRender()
-    if lovr.headset.getOriginType() == 'head' then
-      applyHeadsetOffset()
-    end
-    render()
-  end
-  while true do
-    lovr.event.pump()
-    for name in lovr.event.poll() do
-      if name == 'quit' then return end
-    end
-    lovr.graphics.clear()
-    lovr.graphics.origin()
-    if lovr.headset and lovr.headset.isPresent() and lovr.getOS() ~= 'Web' then
-      lovr.headset.renderTo(headsetRender)
-    end
-    applyHeadsetOffset()
-    render()
-    lovr.graphics.present()
-    lovr.timer.sleep((lovr.headset and lovr.headset.isPresent()) and .001 or .1)
-  end
-end
-
-lovr.filesystem = require('lovr.filesystem')
-
-local runnable = lovr.filesystem.isFile('conf.lua') or lovr.filesystem.isFile('main.lua')
-if not lovr.filesystem.getSource() or not runnable then
-  function lovr.conf(t)
-    t.modules.audio = false
-    t.modules.math = false
-    t.modules.physics = false
-  end
-
-  local logo, controllers
-
-  function lovr.load()
-    local texture = lovr.graphics.newTexture(lovr.filesystem.newBlob(lovr._logo, 'logo.png'))
-    logo = lovr.graphics.newMaterial(texture)
-    lovr.graphics.setBackgroundColor(.960, .988, 1.0)
-    refreshControllers()
-  end
-
-  function lovr.draw()
-    lovr.graphics.setColor(1.0, 1.0, 1.0)
-
-    for controller, model in pairs(controllers) do
-      local x, y, z = controller:getPosition()
-      model:draw(x, y, z, 1, controller:getOrientation())
-    end
-
-    local padding = .1
-    local font = lovr.graphics.getFont()
-    local fade = .315 + .685 * math.abs(math.sin(lovr.timer.getTime() * 2))
-    local titlePosition = 1.3 - padding
-    local subtitlePosition = titlePosition - font:getHeight() * .25 - padding
-
-    lovr.graphics.plane(logo, 0, 1.8, -3, 1, 0, 0, 1)
-    lovr.graphics.setColor(.059, .059, .059)
-    lovr.graphics.print('LÖVR', -.01, titlePosition, -3, .25, 0, 0, 1, 0, nil, 'center', 'top')
-    lovr.graphics.setColor(.059, .059, .059, fade)
-    lovr.graphics.print('No game :(', -.01, subtitlePosition, -3, .15, 0, 0, 1, 0, nil, 'center', 'top')
-  end
-
-  function refreshControllers()
-    controllers = {}
-
-    if not lovr.headset then return end
-
-    for _, controller in pairs(lovr.headset.getControllers()) do
-      controllers[controller] = controller:newModel()
-    end
-  end
-
-  lovr.controlleradded = refreshControllers
-  lovr.controllerremoved = refreshControllers
-end
-
-local success, err = pcall(require, 'conf')
-local conferr
-if lovr.conf then
-  success, conferr = pcall(lovr.conf, conf)
-end
-
-lovr._setConf(conf)
-
-lovr.filesystem.setIdentity(conf.identity)
-
-local modules = { 'audio', 'event', 'graphics', 'headset', 'math', 'physics', 'timer' }
-for _, module in ipairs(modules) do
-  if conf.modules[module] then
-    lovr[module] = require('lovr.' .. module)
-  end
-end
-
--- Error after window is created
-if conferr then
-  error(conferr)
-end
-
-lovr.handlers = setmetatable({
-  quit = function() end,
-  focus = function(f)
-    if lovr.focus then lovr.focus(f) end
-  end,
-  controlleradded = function(c)
-    if lovr.controlleradded then lovr.controlleradded(c) end
-  end,
-  controllerremoved = function(c)
-    if lovr.controllerremoved then lovr.controllerremoved(c) end
-  end,
-  controllerpressed = function(c, b)
-    if lovr.controllerpressed then lovr.controllerpressed(c, b) end
-  end,
-  controllerreleased = function(c, b)
-    if lovr.controllerreleased then lovr.controllerreleased(c, b) end
-  end
-}, {
-  __index = function(self, event)
-    error('Unknown event: ' .. tostring(event))
-  end
-})
-
-local function headsetRenderCallback()
-  if lovr.headset.getOriginType() == 'head' then
-    applyHeadsetOffset()
-  end
-  lovr.draw()
-end
-
-function lovr.step()
-  lovr.event.pump()
-  for name, a, b, c, d in lovr.event.poll() do
-    if name == 'quit' and (not lovr.quit or not lovr.quit()) then
-      return a
-    end
-    lovr.handlers[name](a, b, c, d)
-  end
-  local dt = lovr.timer.step()
-  if lovr.headset then
-    lovr.headset.update(dt)
-  end
-  if lovr.audio then
-    lovr.audio.update()
-    if lovr.headset and lovr.headset.isPresent() then
-      lovr.audio.setOrientation(lovr.headset.getOrientation())
-      lovr.audio.setPosition(lovr.headset.getPosition())
-      lovr.audio.setVelocity(lovr.headset.getVelocity())
-    end
-  end
-  if lovr.update then lovr.update(dt) end
-  if lovr.graphics then
-    lovr.graphics.clear()
-    lovr.graphics.origin()
-    if lovr.draw then
-      if lovr.headset and lovr.headset.isPresent() then
-        lovr.headset.renderTo(headsetRenderCallback)
-      else
-        applyHeadsetOffset()
-        lovr.draw()
-      end
-    end
-    lovr.graphics.present()
-  end
-  lovr.timer.sleep(.001)
-end
-
-function lovr.run()
-  if lovr.load then lovr.load() end
-  while true do
-    local exit = lovr.step()
-    if exit then return exit end
-  end
-end
-
-if lovr.filesystem.isFile('main.lua') then
-  require('main')
-end
diff --git a/src/loaders/font.c b/src/loaders/font.c
index eb7439d4..e9de68c5 100644
--- a/src/loaders/font.c
+++ b/src/loaders/font.c
@@ -1,5 +1,5 @@
 #include "loaders/font.h"
-#include "data/Cabin.ttf.h"
+#include "resources/Cabin.ttf.h"
 #include "util.h"
 #include "msdfgen-c.h"
 #include <ft2build.h>
diff --git a/src/lovr.c b/src/lovr.c
index 13eeeebe..50a3f12f 100644
--- a/src/lovr.c
+++ b/src/lovr.c
@@ -1,8 +1,8 @@
 #include "lovr.h"
 #include "util.h"
 #include "api/lovr.h"
-#include "data/boot.lua.h"
-#include "data/logo.png.h"
+#include "resources/boot.lua.h"
+#include "resources/logo.png.h"
 #include "lib/lua-cjson/lua_cjson.h"
 #include "lib/lua-enet/enet.h"
 #include "lib/glfw.h"
diff --git a/src/data/Cabin.ttf b/src/resources/Cabin.ttf
similarity index 100%
rename from src/data/Cabin.ttf
rename to src/resources/Cabin.ttf
diff --git a/src/data/Cabin.ttf.h b/src/resources/Cabin.ttf.h
similarity index 100%
rename from src/data/Cabin.ttf.h
rename to src/resources/Cabin.ttf.h
diff --git a/src/data/boot.lua.h b/src/resources/boot.lua.h
similarity index 100%
rename from src/data/boot.lua.h
rename to src/resources/boot.lua.h
diff --git a/src/data/logo.png b/src/resources/logo.png
similarity index 100%
rename from src/data/logo.png
rename to src/resources/logo.png
diff --git a/src/data/logo.png.h b/src/resources/logo.png.h
similarity index 100%
rename from src/data/logo.png.h
rename to src/resources/logo.png.h