Update lovr and explain org.lovr.test in the README

mcclure · Jun 10, 2019 · ba5f8ce · ba5f8ce
1 parent 61ff063
commit ba5f8ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-This is a repository for building LovrApp, a standalone Android app which is based on the [LÖVR](lovr.org) VR API.
+This is a repository for building LovrApp, a standalone Android app which is based on the [LÖVR](https://lovr.org) VR API.
 
 # Usage
 
@@ -62,6 +62,16 @@ Edit `LovrApp/Projects/build.gradle`. Change "project.archivesBaseName" and "app
 
 Edit `LovrApp/Projects/Android/AndroidManifest.xml`. Change "package=" at the top to your identifier and change "android:label=" partway down (right after YOUR NAME HERE) to your name.
 
+## To build the autoloader test app:
+
+When built without any changes, this repo produces an "org.lovr.appsample" app that prints a "game not found" message. If you look in the Github "releases" section, however, you'll find a "org.lovr.test" app that loads a game from the SD card where you can easily copy it using `adb sync`. Run the app for full instructions.
+
+To build the `org.lovr.test` app yourself:
+
+* `git clone` a copy of [[https://github.com/mcclure/lodr]]. Save the path to the `lodr` directory.
+* In the lovr-oculus-mobile repo, in the `LovrApp` directory, create a file `local_assets.txt` containing the path to the `lodr` directory.
+* Edit the file `LovrApp/Projects/build.gradle` and change the "archivesBaseName" to `test`.
+
 ## Debugging:
 
 If you get a crash, select the crash report in `adb logcat`, then run this to extract the crash report and look up line numbers:

diff --git a/cmakelib/lovr b/cmakelib/lovr
+8 −5		.gitignore
+1 −1		CMakeLists.txt
+1 −0		README.md
+3 −0		Tupfile
+90 −0		Tuprules.tup
+3 −0		src/Tupdefault
+9 −2		src/api/api.h
+9 −8		src/api/l_audio.c
+2 −1		src/api/l_audioStream.c
+5 −3		src/api/l_canvas.c
+3 −3		src/api/l_collider.c
+14 −9		src/api/l_curve.c
+12 −10		src/api/l_data.c
+33 −4		src/api/l_event.c
+2 −1		src/api/l_filesystem.c
+1 −1		src/api/l_font.c
+57 −15		src/api/l_graphics.c
+49 −50		src/api/l_headset.c
+35 −15		src/api/l_joints.c
+3 −3		src/api/l_mat4.c
+1 −1		src/api/l_material.c
+32 −21		src/api/l_math.c
+2 −1		src/api/l_mesh.c
+2 −1		src/api/l_microphone.c
+2 −2		src/api/l_model.c
+18 −17		src/api/l_physics.c
+1 −1		src/api/l_quat.c
+1 −0		src/api/l_shader.c
+1 −0		src/api/l_shaderBlock.c
+50 −30		src/api/l_shapes.c
+7 −0		src/api/l_soundData.c
+6 −6		src/api/l_source.c
+7 −0		src/api/l_textureData.c
+5 −3		src/api/l_thread_module.c
+2 −2		src/api/l_vec3.c
+10 −9		src/api/l_world.c
+89 −95		src/core/luax.c
+12 −15		src/core/luax.h
+1 −635		src/core/maf.c
+662 −50		src/core/maf.h
+5 −1		src/core/platform.h
+4 −0		src/core/platform_android.c.h
+31 −0		src/core/platform_glfw.c.h
+9 −0		src/core/ref.c
+33 −0		src/core/ref.h
+0 −90		src/core/types.c
+0 −89		src/core/types.h
+2 −3		src/core/util.c
+20 −3		src/core/util.h
+2 −1		src/main.c
+11 −11		src/modules/audio/audio.c
+1 −1		src/modules/audio/microphone.c
+4 −3		src/modules/audio/source.c
+1 −1		src/modules/data/audioStream.c
+2 −0		src/modules/data/modelData.c
+2 −2		src/modules/data/modelData.h
+1 −1		src/modules/data/modelData_gltf.c
+2 −0		src/modules/data/modelData_obj.c
+2 −1		src/modules/data/rasterizer.c
+3 −3		src/modules/data/soundData.c
+264 −4		src/modules/data/textureData.c
+15 −208		src/modules/data/textureData.h
+2 −2		src/modules/event/event.c
+5 −1		src/modules/event/event.h
+0 −1		src/modules/filesystem/file.c
+1 −1		src/modules/graphics/animator.c
+2 −0		src/modules/graphics/canvas.c
+1 −0		src/modules/graphics/font.c
+2 −1		src/modules/graphics/graphics.c
+13 −0		src/modules/graphics/graphics.h
+1 −0		src/modules/graphics/material.c
+2 −0		src/modules/graphics/mesh.c
+11 −0		src/modules/graphics/model.c
+116 −5		src/modules/graphics/opengl.c
+2 −1		src/modules/graphics/shader.c
+12 −0		src/modules/headset/Tupfile
+15 −24		src/modules/headset/desktop.c
+2 −5		src/modules/headset/headset.h
+5 −5		src/modules/headset/leap.c
+3 −0		src/modules/headset/oculus.c
+16 −20		src/modules/headset/oculus_mobile.c
+3 −10		src/modules/headset/openvr.c
+48 −43		src/modules/math/curve.c
+1 −1		src/modules/math/math.c
+2 −1		src/modules/physics/physics.c
+2 −2		src/modules/physics/physics.h
+2 −1		src/modules/thread/channel.c
+2 −1		src/modules/thread/thread.c
+2 −6		src/modules/timer/timer.c
+4 −0		src/resources/Tupfile
+122 −0		src/resources/bindings_touch.json
+424 −0		src/resources/bindings_touch.json.h
+5 −1		src/resources/boot.lua
+493 −487		src/resources/boot.lua.h
+5 −8		src/resources/math.lua
+917 −919		src/resources/math.lua.h
+21 −16		src/resources/webvr.js
+65 −0		tup.config