Browse Source

Documentation update.

Lasse Öörni 12 years ago
parent
commit
e90e99536a
5 changed files with 29 additions and 4 deletions
  1. 1 3
      Bin/Data/LuaScripts/05_AnimatingScene.lua
  2. 1 0
      Docs/GettingStarted.dox
  3. 1 0
      Docs/Urho3D.dox
  4. 25 1
      License.txt
  5. 1 0
      Readme.txt

+ 1 - 3
Bin/Data/LuaScripts/05_AnimatingScene.lua

@@ -70,9 +70,7 @@ function CreateScene()
 
 
         -- Add the Rotator script object which will rotate the scene node each frame, when the scene sends its update event.
         -- Add the Rotator script object which will rotate the scene node each frame, when the scene sends its update event.
         -- This requires the C++ component LuaScriptInstance in the scene node, which acts as a container. We need to tell the 
         -- This requires the C++ component LuaScriptInstance in the scene node, which acts as a container. We need to tell the 
-        -- script file and class name to instantiate the object (scriptFile is a global property which refers to the currently
-        -- executing script file.) There is also a shortcut for creating the LuaScriptInstance component and the script object,
-        -- which is shown in a later sample, but this is what happens "under the hood."
+        -- class name to instantiate the object
         local instance = boxNode:CreateComponent("LuaScriptInstance")
         local instance = boxNode:CreateComponent("LuaScriptInstance")
         instance:CreateObject("Rotator")
         instance:CreateObject("Rotator")
         instance.object.rotationSpeed = Vector3(10.0, 20.0, 30.0)
         instance.object.rotationSpeed = Vector3(10.0, 20.0, 30.0)

+ 1 - 0
Docs/GettingStarted.dox

@@ -329,6 +329,7 @@ Third-party libraries are used for the following functionality:
 
 
 - AngelScript: scripting language implementation
 - AngelScript: scripting language implementation
 - Bullet: physics simulation implementation
 - Bullet: physics simulation implementation
+- Civetweb: HTTP requests, use could be expanded to also provide an embedded web server
 - FreeType: font rendering
 - FreeType: font rendering
 - GLEW: OpenGL extensions handling
 - GLEW: OpenGL extensions handling
 - kNet: UDP networking
 - kNet: UDP networking

+ 1 - 0
Docs/Urho3D.dox

@@ -86,6 +86,7 @@ Urho3D uses the following third-party libraries:
 
 
 - AngelScript 2.27.0 (http://www.angelcode.com/angelscript/)
 - AngelScript 2.27.0 (http://www.angelcode.com/angelscript/)
 - Bullet 2.81 (http://www.bulletphysics.org/)
 - Bullet 2.81 (http://www.bulletphysics.org/)
+- Civetweb (http://sourceforge.net/projects/civetweb/)
 - FreeType 2.3.12 (http://www.freetype.org/)
 - FreeType 2.3.12 (http://www.freetype.org/)
 - GLEW 1.9.0 (http://glew.sourceforge.net/)
 - GLEW 1.9.0 (http://glew.sourceforge.net/)
 - jo_jpeg 1.52 (http://www.jonolick.com/uploads/7/9/2/1/7921194/jo_jpeg.cpp)
 - jo_jpeg 1.52 (http://www.jonolick.com/uploads/7/9/2/1/7921194/jo_jpeg.cpp)

+ 25 - 1
License.txt

@@ -116,6 +116,30 @@ misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 3. This notice may not be removed or altered from any source distribution.
 
 
 
 
+Civetweb license
+----------------
+
+Copyright (c) 2004-2012 Sergey Lyubka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 The FreeType Project disclaimer
 The FreeType Project disclaimer
 -------------------------------
 -------------------------------
 
 
@@ -472,4 +496,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

+ 1 - 0
Readme.txt

@@ -58,6 +58,7 @@ Urho3D is greatly inspired by OGRE (http://www.ogre3d.org) and Horde3D
 Urho3D uses the following third-party libraries:
 Urho3D uses the following third-party libraries:
 - AngelScript 2.27.0 (http://www.angelcode.com/angelscript/)
 - AngelScript 2.27.0 (http://www.angelcode.com/angelscript/)
 - Bullet 2.81 (http://www.bulletphysics.org/)
 - Bullet 2.81 (http://www.bulletphysics.org/)
+- Civetweb (http://sourceforge.net/projects/civetweb/)
 - FreeType 2.3.12 (http://www.freetype.org/)
 - FreeType 2.3.12 (http://www.freetype.org/)
 - GLEW 1.9.0 (http://glew.sourceforge.net/)
 - GLEW 1.9.0 (http://glew.sourceforge.net/)
 - jo_jpeg 1.52 (http://www.jonolick.com/uploads/7/9/2/1/7921194/jo_jpeg.cpp)
 - jo_jpeg 1.52 (http://www.jonolick.com/uploads/7/9/2/1/7921194/jo_jpeg.cpp)