Skip to content

Commit

Permalink
final debugs
Browse files Browse the repository at this point in the history
  • Loading branch information
bcmdarroch committed Jul 26, 2017
1 parent 14a3307 commit 33d5624
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 469 deletions.
Binary file removed assets/Emma.epub
Binary file not shown.
113 changes: 0 additions & 113 deletions assets/books/room/part1.txt

This file was deleted.

61 changes: 0 additions & 61 deletions assets/books/room/part2.txt

This file was deleted.

42 changes: 0 additions & 42 deletions assets/books/room/part3.txt

This file was deleted.

130 changes: 0 additions & 130 deletions assets/books/room/part4.txt

This file was deleted.

40 changes: 0 additions & 40 deletions assets/books/room/part5.txt

This file was deleted.

52 changes: 0 additions & 52 deletions assets/books/room/part6.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@
<div xml:space="preserve" class="pgmonospaced pgheader"><br/>The Project Gutenberg EBook of Emma, by Jane Austen<br/><br/>This eBook is for the use of anyone anywhere at no cost and with<br/>almost no restrictions whatsoever.  You may copy it, give it away or<br/>re-use it under the terms of the Project Gutenberg License included<br/>with this eBook or online at www.gutenberg.org<br/><br/><br/>Title: Emma<br/><br/>Author: Jane Austen<br/><br/>Release Date: January 21, 2010 [EBook #158]<br/>Last Updated: October 17, 2016<br/><br/>Language: English<br/><br/><br/>*** START OF THIS PROJECT GUTENBERG EBOOK EMMA ***<br/><br/><br/><br/><br/>Produced by An Anonymous Volunteer, and David Widger<br/><br/><br/><br/><br/><br/><br/></div>
<p><br/>
<br/></p>
<h1 id="pgepubid00000">EMMA</h1>
<p><br/></p>
<h2>By Jane Austen</h2>
<p><br/>
<br/></p>
<hr/>
<p><br/>
<br/></p>
<blockquote><div>
<p class="toc"><big class="c1">CONTENTS</big></p>
<p><br/></p>
Expand Down Expand Up @@ -89,6 +81,8 @@ <h2>By Jane Austen</h2>
<p class="toc"><a href="@public@vhost@g@gutenberg@html@files@158@[email protected]#link2HCH0054" class="pginternal" tag="{http://www.w3.org/1999/xhtml}a">CHAPTER XVIII</a></p>
<p class="toc"><a href="@public@vhost@g@gutenberg@html@files@158@[email protected]#link2HCH0055" class="pginternal" tag="{http://www.w3.org/1999/xhtml}a">CHAPTER XIX</a></p>
</div></blockquote>
<h1 id="pgepubid00000">EMMA</h1>
<h2>By Jane Austen</h2>
<h1 id="pgepubid00001">VOLUME I</h1>
<h2 id="pgepubid00002">CHAPTER I</h2>
<p>Emma Woodhouse, handsome, clever, and rich, with a comfortable home and happy disposition, seemed to unite some of the best blessings of existence; and had lived nearly twenty-one years in the world with very little to distress or vex her.</p>
Expand Down
13 changes: 3 additions & 10 deletions lib/book.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,9 @@ function Book:draw()
if controller:getAxis('trigger') == 1 and lovr.controllerPlaneCollide(controller) == true then
self.x, self.y, self.z = controller:getPosition()
self.angle, self.ax, self.ay, self.az = controller:getOrientation()

if controller:getAxis('touchy') > 0 then
self.scalex = 1 + controller:getAxis('touchy')
self.scaley = 1 + controller:getAxis('touchy')
self.scalez = 1 + controller:getAxis('touchy')
else
self.scalex = 1 + controller:getAxis('touchy')
self.scaley = 1 + controller:getAxis('touchy')
self.scalez = 1 + controller:getAxis('touchy')
end
self.scalex = 0.75 + controller:getAxis('touchy')
self.scaley = 0.75 + controller:getAxis('touchy')
self.scalez = 0.75 + controller:getAxis('touchy')
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/library.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ end
function Library:parseHTML(file)
local htmlparser = require('lib/htmlparser/init')

-- remove nested a-tags
-- remove nested a-tags, convert h1 and h2
local rawText = lovr.filesystem.read(file)
rawText = string.gsub(rawText, [[<a (.+)<!-- H2 anchor -->]], "")
rawText = string.gsub(rawText, "h1", "p")
Expand Down
1 change: 0 additions & 1 deletion lovr
Submodule lovr deleted from abaecb
19 changes: 9 additions & 10 deletions main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,11 @@ function lovr.draw()
for i, object in ipairs(environment) do
object:draw(0, 0, 0, SCALE)
end
chair:draw(-0.95, 0, 0, SCALE + 0.05, 0)
for i = 0, 3, 90 do
wall:draw(0, 0, 0, SCALE, math.rad(i))
end
-- wall:draw(0, 0, 0, SCALE, 0)
-- wall:draw(0, 0, 0, SCALE, math.rad(90))
-- wall:draw(0, 0, 0, SCALE, math.rad(270))
chair:draw(-0.1, 0, 0, SCALE + 0.05, 0)

wall:draw(0, 0, 0, SCALE, 0)
wall:draw(0, 0, 0, SCALE, math.rad(90))
wall:draw(0, 0, 0, SCALE, math.rad(270))

end

Expand Down Expand Up @@ -114,10 +112,10 @@ function lovr.controllerremoved()
end

function lovr.controllerpressed(controller, button)
if button == 'menu' then
if button == 'menu' and lovr.selectBook(controller) then
activeBook = lovr.selectBook(controller)['book']
activeBook.x, activeBook.y, activeBook.z = lovr.selectBook(controller)['position']:transformPoint(0, 0, 0)
activeBook.y = activeBook.y + 0.3
activeBook.y = activeBook.y + 0.5
end

if button == 'touchpad' then
Expand Down Expand Up @@ -167,6 +165,7 @@ function lovr.selectBook(controller)
return book
end
end
return activeBook

return nil

end
1 change: 0 additions & 1 deletion openvr
Submodule openvr deleted from 9d48cc

0 comments on commit 33d5624

Please sign in to comment.