diff org/world.org @ 460:763d13f77e03

merge in laptop changes.
author Robert McIntyre <rlm@mit.edu>
date Thu, 27 Mar 2014 17:57:01 -0400
parents 939bcc5950b2
children
line wrap: on
line diff
     1.1 --- a/org/world.org	Thu Mar 27 17:56:26 2014 -0400
     1.2 +++ b/org/world.org	Thu Mar 27 17:57:01 2014 -0400
     1.3 @@ -177,7 +177,7 @@
     1.4  
     1.5  (defn initialize-inputs
     1.6    "Establish key-bindings for a particular virtual world."
     1.7 -  [game  input-manager key-map]
     1.8 +  [game input-manager key-map]
     1.9    (doall
    1.10     (map (fn [[name trigger]]
    1.11            (.addMapping
    1.12 @@ -192,9 +192,6 @@
    1.13  
    1.14  #+end_src
    1.15  
    1.16 -#+results: input
    1.17 -: #'cortex.world/initialize-inputs
    1.18 -
    1.19  These functions are for controlling the world through the keyboard and
    1.20  mouse.
    1.21  
    1.22 @@ -247,7 +244,7 @@
    1.23    "the =world= function takes care of the details of initializing a
    1.24    SimpleApplication.
    1.25  
    1.26 -   ***** Arguments:
    1.27 +   ,***** Arguments:
    1.28  
    1.29     - root-node : a com.jme3.scene.Node object which contains all of
    1.30         the objects that should be in the simulation.