Skip to content

Commit

Permalink
Rename blender-vr -> source and a few fixes when referring to samples…
Browse files Browse the repository at this point in the history
… new paths
  • Loading branch information
dfelinto committed Apr 10, 2015
1 parent 8fcd171 commit f4dcb2c
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
12 changes: 6 additions & 6 deletions manual/components/configuration-file.rst
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Also, don't understimate the console screens, they are great for debugging.
<computers>
<computer name='Left' hostname='192.168.0.1'>
<system root='C:/BlenderVR/blender-vr' anchor='C:/BlenderVR/samples'>
<system root='C:/BlenderVR/source' anchor='C:/BlenderVR/samples'>
<daemon transmit='True'>
<environment>SystemRoot=C:/Windows</environment>
Expand All @@ -191,7 +191,7 @@ Also, don't understimate the console screens, they are great for debugging.
</computer>
<computer name='Right' hostname='192.168.0.2'>
<system root='Z:/BlenderVR/blender-vr' anchor='Z:/BlenderVR/samples'>
<system root='Z:/BlenderVR/source' anchor='Z:/BlenderVR/samples'>
<daemon transmit='True'>
<environment>SystemRoot=C:/Windows</environment>
Expand Down Expand Up @@ -262,7 +262,7 @@ Desktop Oculus DK2
.. note::

In order to use the Oculus DK2 you need to run a server separately.
More on the `sample files <https://github.com/BlenderVR/samples/tree/master/advanced-examples/oculus-rift-dk2>`__
More on the `sample files <https://github.com/BlenderVR/samples/tree/master/advanced/oculus-rift-dk2>`__


This configuration has three screens - the main one to be used for deployment, and two others used for debugging and testing:
Expand Down Expand Up @@ -385,7 +385,7 @@ It's important to make sure the master computer can connect to the slave and to
<?xml version="1.0"?>
<blendervr>
<starter blender='/Users/MYUSER/BlenderVR/blender/blender.app/Contents/MacOS/blender' hostname='192.168.0.1' anchor='/Users/MYUSER/BlenderVR/blender-vr/samples'>
<starter blender='/Users/MYUSER/BlenderVR/blender/blender.app/Contents/MacOS/blender' hostname='192.168.0.1' anchor='/Users/MYUSER/BlenderVR/samples'>
<config name='Oculus DK2 Dual1 Dual'>oculus dk2 left, oculus dk2 right</config>
</starter>
Expand All @@ -397,7 +397,7 @@ It's important to make sure the master computer can connect to the slave and to
<computers>
<computer name='Left' hostname='192.168.0.1'>
<system root='/Users/MYUSER/BlenderVR/blender-vr' anchor='/Users/MYUSER/BlenderVR/samples'>
<system root='/Users/MYUSER/BlenderVR/source' anchor='/Users/MYUSER/BlenderVR/samples'>
<blenderplayer executable='/Users/MYUSER/BlenderVR/blender/blenderplayer.app/Contents/MacOS/blenderplayer'/>
<login remote_command="ssh MYUSER@192.168.0.1" python="/Users/MYUSER/BlenderVR/venv/bin/python3.4"/>
<library path="/Users/MYUSER/BlenderVR/venv/lib/python3.4/site-packages" />
Expand All @@ -406,7 +406,7 @@ It's important to make sure the master computer can connect to the slave and to
</computer>
<computer name='Right' hostname='192.168.0.2'>
<system root='C:/BlenderVR/blender-vr' anchor='C:/BlenderVR/samples'>
<system root='C:/BlenderVR/source' anchor='C:/BlenderVR/samples'>
<daemon transmit='True'>
<environment>SystemRoot=C:/Windows</environment>
</daemon>
Expand Down
8 changes: 4 additions & 4 deletions manual/development/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Source Code API [1]_ and the User Manual [2]_.
Even though those parts are independently hosted and maintained, they
are both built on the same framework.

.. [1] `code <https://github.com/BlenderVR/blender-vr>`__, `compiled <http://blender-vr.readthedocs.org>`__
.. [1] `code <https://github.com/BlenderVR/source>`__, `compiled <http://blender-vr.readthedocs.org>`__
.. [2] `code <https://github.com/BlenderVR/manual>`__, `compiled <http://blender-vr-manual.readthedocs.org>`__
Document Sections:
Expand Down Expand Up @@ -44,7 +44,7 @@ Type the following commands in your terminal. If you are developing in Windows w
$ cd $INSTALL_DIR
$ git clone https://github.com/BlenderVR/manual.git
$ source venv/bin/activate
$ pip requirements -r blender-vr/docs/requirements.txt
$ pip requirements -r source/docs/requirements.txt
$ pip requirements -r manual/requirements.txt
$ deactivate
Expand Down Expand Up @@ -76,11 +76,11 @@ Souce Code API
$ cd $INSTALL_DIR
$ source venv/bin/activate
$ cd blender-vr/docs/
$ cd source/docs/
$ make
$ deactivate
This will output the documentation to ``$INSTALL_DIR/blender-vr/docs/html``.
This will output the documentation to ``$INSTALL_DIR/source/docs/html``.


How to Edit
Expand Down
4 changes: 2 additions & 2 deletions manual/development/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Links
-----

* `All Repositories <https://github.com/BlenderVR>`_
* `Source Code Repository <https://github.com/BlenderVR/blender-vr>`_
* `Source Code Repository <https://github.com/BlenderVR/source>`_
* `Manual Repository <https://github.com/BlenderVR/manual>`_
* `Samples Repository <https://github.com/BlenderVR/samples>`_
* `Bug List <https://github.com/BlenderVR/blender-vr/issues>`_
* `Bug List <https://github.com/BlenderVR/source/issues>`_

Development Documents
----------------------
Expand Down
4 changes: 2 additions & 2 deletions manual/installation/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ To download the latest BlenderVR git version (master HEAD):

.. code-block:: bash
$ git clone https://github.com/BlenderVR/blender-vr.git
$ git clone https://github.com/BlenderVR/source.git
If you do not intend to modify BlenderVR source code, simply download the `BlenderVR Sources <https://github.com/BlenderVR/blender-vr/archive/v1.0.zip>`_ zipfile.
If you do not intend to modify BlenderVR source code, simply download the `BlenderVR Sources <https://github.com/BlenderVR/source/archive/v1.0.zip>`_ zipfile.

Download Samples Scenes
-----------------------
Expand Down
16 changes: 8 additions & 8 deletions manual/installation/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Folder Structure

After all the downloads and installations you should end up with the following folder structure. This is a recommendation, and it will be used as reference along this manual (the directory holding these files is referred as $INSTALL_DIR in the next sections).

``//blender-vr/``
``//source/``
*BlenderVR Source Code*

``//blender/``
Expand Down Expand Up @@ -56,7 +56,7 @@ Optionally you can use a patched version of Blender 2.73a available here for al
Acquiring BlenderVR
-------------------

* `BlenderVR Sources <https://github.com/BlenderVR/blender-vr/archive/v1.0.zip>`_ (download and unzip in the top folder, rename it **blender-vr**)
* `BlenderVR Sources <https://github.com/BlenderVR/source/archive/v1.0.zip>`_ (download and unzip in the top folder, rename it **source**)

Download Samples Scenes
-----------------------
Expand All @@ -73,7 +73,7 @@ To check which samples are available visit the `Samples Repository <https://gith
$ cd $INSTALL_DIR
$ mkdir -p samples
$ svn checkout https://github.com/BlenderVR/samples/trunk/simple samples/
$ svn checkout https://github.com/BlenderVR/samples/trunk/basic/basic samples/
(Or simply `svn checkout` the required sample with SVN Tortoise).

Expand Down Expand Up @@ -110,7 +110,7 @@ On OSX/Linux:
$ pip3 install virtualenv
$ pyvenv venv
$ source venv/bin/activate
$ pip3 install -r blender-vr/requirements.txt
$ pip3 install -r source/requirements.txt
$ pyside_postinstall.py -install
.. note::
Expand All @@ -128,9 +128,9 @@ On Windows:
$ pip3 install virtualenv
$ virtualenv venv
$ .\venv\Scripts\activate
$ pip3 install -r blender-vr\requirements.txt
$ pip3 install -r source\requirements.txt
$ python3 .\venv\Scripts\pyside_postinstall.py -install
$ python3 .\blender-vr\BlenderVR
$ python3 .\source\blendervr
You may have to add the path to the python binary, e.g.

Expand All @@ -151,15 +151,15 @@ On OSX/Linux:
$ cd $INSTALL_DIR
$ source venv/bin/activate
$ ./blender-vr/BlenderVR
$ ./source/blendervr
On Windows:
.. code-block:: bash
$ cd $INSTALL_DIR
$ .\venv\Scripts\activate
$ python3 .\blender-vr\BlenderVR
$ python3 .\source\blendervr
You should now see the BlenderVR window popping up (see figure below). Congratulations your installation was a success!
Expand Down
10 changes: 5 additions & 5 deletions manual/installation/plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ then follow compilation instructions from `VRPN Compiling <http://www.cs.unc.edu

Add the path of the vrpn python directory (e.g. `$INSTALL_DIR/plugins/vrpn/build/python`) to your `configuration file <components/configuration-file.html>`_ libraries.

Once done, launch the ``basic-vrpn.blend`` scene in ``$INSTALL_DIR/samples/oculus_dk2/``.
Once done, launch the ``basic-vrpn.blend`` scene in ``$INSTALL_DIR/samples/plugin/vrpn/basic-vrpn/``.

Oculus Rift DK2
---------------
Expand Down Expand Up @@ -76,15 +76,15 @@ On OSX/Linux:
$ cd $INSTALL_DIR
$ source venv/bin/activate
$ pip3 install -r blender-vr/requirements-dk2.txt
$ pip3 install -r source/requirements-dk2.txt
On Windows:

.. code-block:: bash
$ cd $INSTALL_DIR
$ .\venv\Scripts\activate
$ pip3 install -r blender-vr\requirements-dk2.txt
$ pip3 install -r source\requirements-dk2.txt
Download and install the `Oculus Runtime <https://developer.oculus.com/downloads/>`_ for your architecture.

Expand All @@ -93,6 +93,6 @@ Download and install the `Oculus Runtime <https://developer.oculus.com/downloads
OSX: check on the web to setup your screen configuration for the rift (mirrored display, 90 rotation, etc.), e.g. `here <http://www.reddit.com/r/oculus/comments/2dbxve/041_with_dk2_on_a_mac_incompatible_resolution/>`_
Modify your `configuration file <components/configuration-file.html>`_ to add the path to your newly installed libraries. Check the configuration file ``$INSTALL_DIR/blender-vr/configurations/main-dk2.xml`` for guideline.
Modify your `configuration file <components/configuration-file.html>`_ to add the path to your newly installed libraries. Check the configuration file ``$INSTALL_DIR/source/configurations/main-dk2.xml`` for guideline.

Once done, launch the ``basic-dk2.blend`` scene in ``$INSTALL_DIR/samples/oculus_dk2/``.
Once done, launch the ``basic-dk2.blend`` scene in ``$INSTALL_DIR/samples/plugin/hmd/``.

0 comments on commit f4dcb2c

Please sign in to comment.