Merge remote-tracking branch 'origin/master'

MAtahualpa · Feb 17, 2017 · 79956e4 · 79956e4
2 parents 23818ec + 96ca50e
commit 79956e4
Show file tree

Hide file tree

Showing 53 changed files with 945 additions and 86 deletions.
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
@@ -179,15 +179,6 @@ namespace
         {
         }
 
-        virtual void apply(osg::Group& node)
-        {
-            traverse(node);
-        }
-        virtual void apply(osg::MatrixTransform& node)
-        {
-            traverse(node);
-        }
-
         void remove()
         {
             for (RemoveVec::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
@@ -209,6 +200,15 @@ namespace
             applyImpl(drw);
         }
 
+        virtual void apply(osg::Group& node)
+        {
+            traverse(node);
+        }
+        virtual void apply(osg::MatrixTransform& node)
+        {
+            traverse(node);
+        }
+
         void applyImpl(osg::Node& node)
         {
             osg::NodePath::iterator parent = getNodePath().end()-2;
@@ -240,6 +240,15 @@ namespace
             applyImpl(drw);
         }
 
+        virtual void apply(osg::Group& node)
+        {
+            traverse(node);
+        }
+        virtual void apply(osg::MatrixTransform& node)
+        {
+            traverse(node);
+        }
+
         void applyImpl(osg::Node& node)
         {
             const std::string toFind = "tri bip";

diff --git a/docs/source/_static/.keep b/docs/source/_static/.keep
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -11,16 +11,22 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
-import sys
+import glob
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 project_root = os.path.abspath('../../')
 sys.path.insert(0, project_root)
 
+
+def insensitive_glob(pattern):
+    def either(c):
+        return '[%s%s]' % (c.lower(), c.upper()) if c.isalpha() else c
+    return glob.glob(''.join(map(either, pattern)))
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -35,17 +41,27 @@
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
-    'breathe',
 ]
 
+try:
+    import breathe
+    extensions.append('breathe')
+except ImportError:
+    print("WARNING: Unable to import breathe, code documentation won't be generated.")
+
 # Where breathe can find the source files
+openmw_path = os.path.join(project_root, "apps", "openmw")
+openmw_sub_dirs = os.walk(openmw_path).next()[1]
+openmw_headers = insensitive_glob(os.path.join(openmw_path, "*.hpp"))
+for dir in openmw_sub_dirs:
+    openmw_headers += insensitive_glob(os.path.join(openmw_path, dir, "*.hpp"))
+
+# massage the headers to get the relative path needed
+openmw_headers = [os.path.relpath(x, openmw_path) for x in openmw_headers]
+
 breathe_projects_source = {
-    "openmw": (project_root+"/apps/openmw", ["engine.hpp",
-    "mwbase/dialoguemanager.hpp", "mwbase/environment.hpp",
-    "mwbase/inputmanager.hpp", "mwbase/journal.hpp", "mwbase/mechanicsmanager.hpp",
-    "mwbase/scriptmanager.hpp", "mwbase/soundmanager.hpp", "mwbase/statemanager.hpp",
-    "mwbase/windowmanager.hpp", "mwbase/world.hpp"])
-    }
+    "openmw": (openmw_path, openmw_headers)
+}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -71,10 +87,16 @@
 # The short X.Y version.
 # The full version, including alpha/beta/rc tags.
 
-from parse_cmake import parsing
-cmake_raw = open(project_root+'/CMakeLists.txt', 'r').read()
-cmake_data = parsing.parse(cmake_raw)
-release = version = int(cmake_data[24][1][1].contents), int(cmake_data[25][1][1].contents), int(cmake_data[26][1][1].contents)
+try:
+    from parse_cmake import parsing
+    cmake_raw = open(project_root+'/CMakeLists.txt', 'r').read()
+    cmake_data = parsing.parse(cmake_raw)
+    release = version = '.'.join([cmake_data[24][1][1].contents,
+                                 cmake_data[25][1][1].contents,
+                                 cmake_data[26][1][1].contents])
+except ImportError:
+    release = "UNRELEASED"
+    print("WARNING: Unable to import parse_cmake, version will be set to: {0}.".format(release))
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -150,7 +172,7 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static',
-                    'openmw-cs/_static'
+                    'manuals/openmw-cs/_static'
                     ]
 
 # Add any extra paths that contain custom files (such as robots.txt or

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -1,19 +1,18 @@
+Welcome to OpenMW's Documentation!
+==================================
 
-Welcome to OpenMW's documentation!
-=====================================
-
-Components
-----------
+Sections
+--------
 
 .. toctree::
     :maxdepth: 2
 
-    openmw/index
-    openmw-cs/index
-    openmw-mods/index
+    manuals/index
+    reference/index
+    source/index
 
 
-Indices and tables
+Indices and Tables
 ==================
 
 * :ref:`genindex`

diff --git a/docs/source/manuals/index.rst b/docs/source/manuals/index.rst
@@ -0,0 +1,7 @@
+User Manuals
+============
+
+.. toctree::
+    :maxdepth: 2
+
+    openmw-cs/index
diff --git a/...s/_static/images/chapter-1/add-record.png → ...s/_static/images/chapter-1/add-record.png b/...s/_static/images/chapter-1/add-record.png → ...s/_static/images/chapter-1/add-record.png
diff --git a/.../_static/images/chapter-1/edit-record.png → .../_static/images/chapter-1/edit-record.png b/.../_static/images/chapter-1/edit-record.png → .../_static/images/chapter-1/edit-record.png
diff --git a/.../_static/images/chapter-1/new-project.png → .../_static/images/chapter-1/new-project.png b/.../_static/images/chapter-1/new-project.png → .../_static/images/chapter-1/new-project.png
diff --git a/...w-cs/_static/images/chapter-1/objects.png → ...w-cs/_static/images/chapter-1/objects.png b/...w-cs/_static/images/chapter-1/objects.png → ...w-cs/_static/images/chapter-1/objects.png
diff --git a/...tic/images/chapter-1/opening-dialogue.png → ...tic/images/chapter-1/opening-dialogue.png b/...tic/images/chapter-1/opening-dialogue.png → ...tic/images/chapter-1/opening-dialogue.png
diff --git a/...ource/openmw-cs/files-and-directories.rst → ...nuals/openmw-cs/files-and-directories.rst b/...ource/openmw-cs/files-and-directories.rst → ...nuals/openmw-cs/files-and-directories.rst
diff --git a/docs/source/openmw-cs/foreword.rst → docs/source/manuals/openmw-cs/foreword.rst b/docs/source/openmw-cs/foreword.rst → docs/source/manuals/openmw-cs/foreword.rst
diff --git a/docs/source/openmw-cs/index.rst → docs/source/manuals/openmw-cs/index.rst b/docs/source/openmw-cs/index.rst → docs/source/manuals/openmw-cs/index.rst
@@ -1,5 +1,4 @@
-#####################
-OpenMW CS user manual
+OpenMW CS User Manual
 #####################
 
 The following document is the complete user manual for *OpenMW CS*, the
@@ -9,17 +8,17 @@ modding *The Elder Scrolls III: Morrowind* you should at least read the first
 few chapters to familiarise yourself with the new interface.
 
 .. warning::
-   OpenMW CS is still software in development. The manual does not cover any of
-   its shortcomings, it is written as if everything was working as inteded.
-   Please report any software problems as bugs in the software, not errors in
-   the manual.
+    OpenMW CS is still software in development. The manual does not cover any of
+    its shortcomings, it is written as if everything was working as inteded.
+    Please report any software problems as bugs in the software, not errors in
+    the manual.
 
 .. toctree::
-   :caption: Table of Contents
-   :maxdepth: 2
+    :caption: Table of Contents
+    :maxdepth: 2
 
-   foreword
-   tour
-   files-and-directories
-   starting-dialog
+    foreword
+    tour
+    files-and-directories
+    starting-dialog
 
diff --git a/docs/source/openmw-cs/starting-dialog.rst → ...rce/manuals/openmw-cs/starting-dialog.rst b/docs/source/openmw-cs/starting-dialog.rst → ...rce/manuals/openmw-cs/starting-dialog.rst
diff --git a/docs/source/openmw-cs/tour.rst → docs/source/manuals/openmw-cs/tour.rst b/docs/source/openmw-cs/tour.rst → docs/source/manuals/openmw-cs/tour.rst
diff --git a/docs/source/openmw-mods/index.rst b/docs/source/openmw-mods/index.rst
diff --git a/docs/source/openmw/index.rst b/docs/source/openmw/index.rst
diff --git a/docs/source/reference/index.rst b/docs/source/reference/index.rst
@@ -0,0 +1,7 @@
+Reference Material
+==================
+
+.. toctree::
+    :maxdepth: 2
+
+    modding/index
diff --git a/.../openmw-mods/convert_bump_mapped_mods.rst → ...ence/modding/convert_bump_mapped_mods.rst b/.../openmw-mods/convert_bump_mapped_mods.rst → ...ence/modding/convert_bump_mapped_mods.rst
diff --git a/docs/source/openmw-mods/differences.rst → .../source/reference/modding/differences.rst b/docs/source/openmw-mods/differences.rst → .../source/reference/modding/differences.rst
diff --git a/docs/source/openmw-mods/font.rst → docs/source/reference/modding/font.rst b/docs/source/openmw-mods/font.rst → docs/source/reference/modding/font.rst
diff --git a/docs/source/openmw-mods/foreword.rst → docs/source/reference/modding/foreword.rst b/docs/source/openmw-mods/foreword.rst → docs/source/reference/modding/foreword.rst
diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
@@ -0,0 +1,26 @@
+OpenMW Modding Reference
+########################
+
+The following document is the complete reference guide to modifying, or
+modding, your OpenMW setup. It does not cover content creation itself,
+only how to alter or add to your OpenMW gameplay experience. To learn more
+about creating new content for OpenMW, please refer to
+:doc:`/manuals/openmw-cs/index`.
+
+.. warning::
+    OpenMW is still software in development. This manual does not cover any
+    of its shortcomings. It is written as if everything was working as
+    intended. Please report any software problems as bugs in the software,
+    not errors in the manual.
+
+.. toctree::
+    :caption: Table of Contents
+    :maxdepth: 2
+
+    foreword
+    differences
+    mod-install
+    settings/index
+    font
+    convert_bump_mapped_mods
+    paths
diff --git a/docs/source/openmw-mods/mod-install.rst → .../source/reference/modding/mod-install.rst b/docs/source/openmw-mods/mod-install.rst → .../source/reference/modding/mod-install.rst
diff --git a/docs/source/openmw-mods/paths.rst → docs/source/reference/modding/paths.rst b/docs/source/openmw-mods/paths.rst → docs/source/reference/modding/paths.rst
diff --git a/docs/source/openmw-mods/settings/GUI.rst → ...source/reference/modding/settings/GUI.rst b/docs/source/openmw-mods/settings/GUI.rst → ...source/reference/modding/settings/GUI.rst
diff --git a/docs/source/openmw-mods/settings/HUD.rst → ...source/reference/modding/settings/HUD.rst b/docs/source/openmw-mods/settings/HUD.rst → ...source/reference/modding/settings/HUD.rst
diff --git a/docs/source/openmw-mods/settings/camera.rst → ...rce/reference/modding/settings/camera.rst b/docs/source/openmw-mods/settings/camera.rst → ...rce/reference/modding/settings/camera.rst
@@ -24,7 +24,7 @@ This setting determines whether objects that render to a few pixels or smaller w
 The default value is true. This setting can only be configured by editing the settings configuration file.
 
 small feature culling pixel size
----------------------
+--------------------------------
 
 :Type:		floating point
 :Range:		> 0

diff --git a/docs/source/openmw-mods/settings/cells.rst → ...urce/reference/modding/settings/cells.rst b/docs/source/openmw-mods/settings/cells.rst → ...urce/reference/modding/settings/cells.rst
diff --git a/docs/source/openmw-mods/settings/game.rst → ...ource/reference/modding/settings/game.rst b/docs/source/openmw-mods/settings/game.rst → ...ource/reference/modding/settings/game.rst
diff --git a/docs/source/openmw-mods/settings/general.rst → ...ce/reference/modding/settings/general.rst b/docs/source/openmw-mods/settings/general.rst → ...ce/reference/modding/settings/general.rst
diff --git a/docs/source/openmw-mods/settings/index.rst → ...urce/reference/modding/settings/index.rst b/docs/source/openmw-mods/settings/index.rst → ...urce/reference/modding/settings/index.rst
diff --git a/docs/source/openmw-mods/settings/input.rst → ...urce/reference/modding/settings/input.rst b/docs/source/openmw-mods/settings/input.rst → ...urce/reference/modding/settings/input.rst
diff --git a/docs/source/openmw-mods/settings/map.rst → ...source/reference/modding/settings/map.rst b/docs/source/openmw-mods/settings/map.rst → ...source/reference/modding/settings/map.rst
diff --git a/docs/source/openmw-mods/settings/saves.rst → ...urce/reference/modding/settings/saves.rst b/docs/source/openmw-mods/settings/saves.rst → ...urce/reference/modding/settings/saves.rst
diff --git a/docs/source/openmw-mods/settings/sound.rst → ...urce/reference/modding/settings/sound.rst b/docs/source/openmw-mods/settings/sound.rst → ...urce/reference/modding/settings/sound.rst
diff --git a/docs/source/openmw-mods/settings/video.rst → ...urce/reference/modding/settings/video.rst b/docs/source/openmw-mods/settings/video.rst → ...urce/reference/modding/settings/video.rst
diff --git a/docs/source/openmw-mods/settings/water.rst → ...urce/reference/modding/settings/water.rst b/docs/source/openmw-mods/settings/water.rst → ...urce/reference/modding/settings/water.rst
@@ -1,5 +1,5 @@
 Water Settings
-############
+##############
 
 .. note::
 	The settings for the water shader are difficult to describe, but can be seen immediately in the Water tab of the Video panel in the Options menu. Changes there will be saved to these settings. It is suggested to stand on the shore of a moderately broad body of water with trees or other objects on the far shore to test reflection textures, underwater plants in shallow water near by to test refraction textures, and some deep water visible from your location to test deep water visibility.

diff --git a/docs/source/openmw-mods/settings/windows.rst → ...ce/reference/modding/settings/windows.rst b/docs/source/openmw-mods/settings/windows.rst → ...ce/reference/modding/settings/windows.rst
@@ -1,5 +1,5 @@
 Windows Settings
-############
+################
 
 :Type:	floating point
 :Range:	0.0 to 1.0

diff --git a/docs/source/source/index.rst b/docs/source/source/index.rst
@@ -0,0 +1,7 @@
+Project Source Documentation
+============================
+
+.. toctree::
+    :maxdepth: 2
+
+    openmw/index
diff --git a/docs/source/source/openmw/index.rst b/docs/source/source/openmw/index.rst
@@ -0,0 +1,24 @@
+OpenMW Source Documentation
+###########################
+
+.. toctree::
+    :maxdepth: 2
+
+    mwbase
+    mwclass
+    mwdialogue
+    mwgui
+    mwinput
+    mwmechanics
+    mwphysics
+    mwrender
+    mwscript
+    mwsound
+    mwstate
+    mwworld
+
+.. autodoxygenfile:: engine.hpp
+    :project: openmw
+
+.. autodoxygenfile:: doc.hpp
+    :project: openmw
diff --git a/docs/source/openmw/mwbase.rst → docs/source/source/openmw/mwbase.rst b/docs/source/openmw/mwbase.rst → docs/source/source/openmw/mwbase.rst
@@ -1,4 +1,3 @@
-########
 ./mwbase
 ########
 
@@ -31,4 +30,3 @@
 
 .. autodoxygenfile:: mwbase/world.hpp
   :project: openmw
-