Domů Procházet Nápověda
Přihlásit se
cpp
/
GamePlay
zrcadlo https://github.com/gameplay3d/GamePlay
2
0
Rozštěpit 0
Soubory Úkoly 0 Wiki
Procházet zdrojové kódy

Merge branch 'master' of https://github.com/blackberry/GamePlay

Karim Ahmed před 13 roky
rodič
4ef61ea2ed a2c409a143
revize
37890d5c51
26 změnil soubory, kde provedl 201 přidání a 74 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 15 1
      gameplay-api/header.html
  2. 4 0
      gameplay-encoder/CMakeLists.txt
  3. 17 36
      gameplay.doxyfile
  4. 6 0
      gameplay/src/Animation.cpp
  5. 0 1
      gameplay/src/AnimationClip.cpp
  6. 18 1
      gameplay/src/AnimationTarget.cpp
  7. 1 0
      gameplay/src/Base.h
  8. 1 1
      gameplay/src/Button.h
  9. 1 1
      gameplay/src/CheckBox.h
  10. 2 2
      gameplay/src/Container.h
  11. 1 1
      gameplay/src/Control.h
  12. 1 1
      gameplay/src/Game.h
  13. 1 1
      gameplay/src/Joystick.h
  14. 1 1
      gameplay/src/Layout.h
  15. 3 0
      gameplay/src/MaterialParameter.cpp
  16. 25 12
      gameplay/src/PlatformAndroid.cpp
  17. 5 1
      gameplay/src/PlatformLinux.cpp
  18. 80 3
      gameplay/src/PlatformiOS.mm
  19. 1 1
      gameplay/src/RadioButton.h
  20. 8 0
      gameplay/src/RenderState.cpp
  21. 1 1
      gameplay/src/RenderState.h
  22. 1 1
      gameplay/src/ScriptController.h
  23. 1 1
      gameplay/src/Slider.h
  24. 1 1
      gameplay/src/TextBox.h
  25. 1 1
      gameplay/src/lua/lua_Global.cpp
  26. 5 5
      gameplay/src/lua/lua_RenderStateBlend.cpp

+ 15 - 1
gameplay-api/header.html
Zobrazit soubor 

@@ -7,6 +7,7 @@
 
 

 <link href="tabs.css" rel="stylesheet" type="text/css"/>

 <link href="doxygen.css" rel="stylesheet" type="text/css" />

+<link href="custom.css" rel="stylesheet" type="text/css" />

 

 <link href="search/search.css" rel="stylesheet" type="text/css"/>

 <script type="text/javascript" src="jquery.js"></script>

@@ -17,4 +18,17 @@
 
 

 </head>

 <body>

-<div id="top"><!-- do not remove this div! -->
 
+<div id="top"><!-- do not remove this div! -->

+<table class="header" border="0">

+<tbody>

+<tr>

+<td id="logo"><a href="http://gameplay3d.org/"><img src="images/logo.png" alt="gameplay" border="0" height="64px"/></a></td>

+<td width="100%"/>

+<td><a href="http://gameplay3d.org/"><span class="button">overview</span></a></td><td width="12px"/>

+<td><a href="https://github.com/blackberry/GamePlay/wiki"><span class="button">wiki</span></a></td><td width="12px"/>

+<td><a href="http://blackberry.github.com/GamePlay/api/index.html"><span class="button">api&nbsp;reference</span></a></td><td width="12px"/>

+<td><a href="http://www.gameplay3d.org/forums"><span class="button">forums</span></a></td>

+<td><a href="https://github.com/blackberry/GamePlay"><span class="button">download</span></a></td>

+</tr>

+</tbody>

+</table>

+ 4 - 0
gameplay-encoder/CMakeLists.txt
Zobrazit soubor 

@@ -77,6 +77,8 @@ set(APP_SRC
 
 	src/GPBFile.h
 
 	src/Heightmap.cpp
 
 	src/Heightmap.h
 
+	src/Image.cpp
 
+	src/Image.h
 
 	src/Light.cpp
 
 	src/Light.h
 
 	src/main.cpp
 
@@ -98,6 +100,8 @@ set(APP_SRC
 
 	src/Model.h
 
 	src/Node.cpp
 
 	src/Node.h
 
+	src/NormalMapGenerator.cpp
 
+	src/NormalMapGenerator.h
 
 	src/Object.cpp
 
 	src/Object.h
 
 	src/Quaternion.cpp

+ 17 - 36
gameplay.doxyfile
Zobrazit soubor 

@@ -1,4 +1,4 @@
 
-# Doxyfile 1.8.0
 
+# Doxyfile 1.7.6.1
 
 
 # This file describes the settings to be used by the documentation system
 
 # doxygen (www.doxygen.org) for a project
 
@@ -250,15 +250,6 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 
 
 EXTENSION_MAPPING      = 
 
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all 
-# comments according to the Markdown format, which allows for more readable 
-# documentation. See http://daringfireball.net/projects/markdown/ for details. 
-# The output of markdown processing is further processed by doxygen, so you 
-# can mix doxygen, HTML, and XML commands with Markdown formatting. 
-# Disable only in case of backward compatibilities issues.
 
-
 
-MARKDOWN_SUPPORT       = YES
 
-
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
 # to include (a tag file for) the STL sources as input, then you should 
 # set this tag to YES in order to let doxygen match functions declarations and 
@@ -372,11 +363,6 @@ EXTRACT_ALL            = NO
 
 
 EXTRACT_PRIVATE        = NO
 
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
 
-# scope will be included in the documentation.
 
-
 
-EXTRACT_PACKAGE        = NO
 
-
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
 
 
@@ -1182,7 +1168,7 @@ FORMULA_TRANSPARENT    = YES
 
 # (see http://www.mathjax.org) which uses client side Javascript for the 
 # rendering instead of using prerendered bitmaps. Use this if you do not 
 # have LaTeX installed or if you want to formulas look prettier in the HTML 
-# output. When enabled you may also need to install MathJax separately and 
+# output. When enabled you also need to install MathJax separately and 
 # configure the path to it using the MATHJAX_RELPATH option.
 
 
 USE_MATHJAX            = NO
 
@@ -1191,10 +1177,10 @@ USE_MATHJAX            = NO
 
 # HTML output directory using the MATHJAX_RELPATH option. The destination 
 # directory should contain the MathJax.js script. For instance, if the mathjax 
 # directory is located at the same level as the HTML output directory, then 
-# MATHJAX_RELPATH should be ../mathjax. The default value points to 
-# the MathJax Content Delivery Network so you can quickly see the result without 
-# installing MathJax.  However, it is strongly recommended to install a local 
-# copy of MathJax from http://www.mathjax.org before deployment.
 
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the 
+# mathjax.org site, so you can quickly see the result without installing 
+# MathJax, but it is strongly recommended to install a local copy of MathJax 
+# before deployment.
 
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
 
@@ -1542,16 +1528,20 @@ SKIP_FUNCTION_MACROS   = YES
 
 # Configuration::additions related to external references
 
 #---------------------------------------------------------------------------
 
 
-# The TAGFILES option can be used to specify one or more tagfiles. For each 
-# tag file the location of the external documentation should be added. The 
-# format of a tag file without this location is as follows: 
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
 #   TAGFILES = file1 file2 ... 
 # Adding location for the tag files is done as follows: 
 #   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths 
-# or URLs. Note that each tag file must have a unique name (where the name does 
-# NOT include the path). If a tag file is not located in the directory in which 
-# doxygen is run, you must also specify the path to the tagfile here.
 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
 
 
 TAGFILES               = 
 
@@ -1664,15 +1654,6 @@ GROUP_GRAPHS           = YES
 
 
 UML_LOOK               = NO
 
 
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside 
-# the class node. If there are many fields or methods and many nodes the 
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS 
-# threshold limits the number of items for each type to make the size more 
-# managable. Set this to 0 for no limit. Note that the threshold may be 
-# exceeded by 50% before the limit is enforced.
 
-
 
-UML_LIMIT_NUM_FIELDS   = 10
 
-
 
 # If set to YES, the inheritance and collaboration graphs will show the 
 # relations between templates and their instances.

+ 6 - 0
gameplay/src/Animation.cpp
Zobrazit soubor 

@@ -453,6 +453,12 @@ Animation* Animation::clone(Channel* channel, AnimationTarget* target)
 
     GP_ASSERT(animation->getRefCount() == 1);

 

     // Clone the clips

+    

+    if (_defaultClip)

+    {

+        animation->_defaultClip = _defaultClip->clone(animation);

+    }

+    

     if (_clips)

     {

         for (std::vector<AnimationClip*>::iterator it = _clips->begin(); it != _clips->end(); ++it)

+ 0 - 1
gameplay/src/AnimationClip.cpp
Zobrazit soubor 

@@ -598,7 +598,6 @@ AnimationClip* AnimationClip::clone(Animation* animation) const
 
 {

     // Don't clone the elapsed time, listeners or crossfade information.

     AnimationClip* newClip = new AnimationClip(getId(), animation, getStartTime(), getEndTime());

-    newClip->setRepeatCount(getRepeatCount());

     newClip->setSpeed(getSpeed());

     newClip->setRepeatCount(getRepeatCount());

     newClip->setBlendWeight(getBlendWeight());

+ 18 - 1
gameplay/src/AnimationTarget.cpp
Zobrazit soubor 

@@ -4,6 +4,8 @@
 
 #include "Game.h"

 #include "Node.h"

 

+#define ANIMATION_TARGET_INDEFINITE_STR "INDEFINITE"

+

 namespace gameplay

 {

 

@@ -261,6 +263,21 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
 
         animation = createAnimation(id, propertyId, keyCount, keyTimes, keyValues, (Curve::InterpolationType) curve);

     }

 

+    const char* repeat = animationProperties->getString("repeatCount");

+    if (repeat)

+    {

+        if (strcmp(repeat, ANIMATION_TARGET_INDEFINITE_STR) == 0)

+        {

+            animation->getClip()->setRepeatCount(AnimationClip::REPEAT_INDEFINITE);

+        }

+        else

+        {

+            float value;

+            sscanf(repeat, "%f", &value);

+            animation->getClip()->setRepeatCount(value);

+        }

+    }

+    

     SAFE_DELETE_ARRAY(keyOut);

     SAFE_DELETE_ARRAY(keyIn);

     SAFE_DELETE_ARRAY(keyValues);

@@ -277,7 +294,7 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
 
         }

         animation->createClips(animationProperties, (unsigned int) frameCount);

     }

-

+    

     return animation;

 }

+ 1 - 0
gameplay/src/Base.h
Zobrazit soubor 

@@ -27,6 +27,7 @@
 
 #include <limits>

 #include <functional>

 #include <bitset>

+#include <typeinfo>

 #include "Logger.h"

 

 // Bring common functions from C into global namespace

+ 1 - 1
gameplay/src/Button.h
Zobrazit soubor 

@@ -77,7 +77,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by the control.

      *

+ 1 - 1
gameplay/src/CheckBox.h
Zobrazit soubor 

@@ -123,7 +123,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by the control.

      *

+ 2 - 2
gameplay/src/Container.h
Zobrazit soubor 

@@ -259,7 +259,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by a control within this container.

      *

@@ -340,7 +340,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by scrolling within this container.

      *

+ 1 - 1
gameplay/src/Control.h
Zobrazit soubor 

@@ -805,7 +805,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by this control.

      *

+ 1 - 1
gameplay/src/Game.h
Zobrazit soubor 

@@ -295,7 +295,7 @@ public:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @see Touch::TouchEvent

      */

+ 1 - 1
gameplay/src/Joystick.h
Zobrazit soubor 

@@ -153,7 +153,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by the control.

      *

+ 1 - 1
gameplay/src/Layout.h
Zobrazit soubor 

@@ -80,7 +80,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @see Touch::TouchEvent

      */

+ 3 - 0
gameplay/src/MaterialParameter.cpp
Zobrazit soubor 

@@ -663,6 +663,9 @@ void MaterialParameter::cloneInto(MaterialParameter* materialParameter) const
 
         GP_ERROR("Unsupported material parameter type(%d).", _type);

         break;

     }

+    

+    NodeCloneContext context;

+    this->AnimationTarget::cloneInto(materialParameter, context);

 }

 

 }

+ 25 - 12
gameplay/src/PlatformAndroid.cpp
Zobrazit soubor 

@@ -974,22 +974,35 @@ int Platform::enterMessagePump()
 
     }

     GP_ASSERT(env);

 

-    // Get the package name for this app from Java.

-    jclass clazz = env->GetObjectClass(activity->clazz);

-    jmethodID methodID = env->GetMethodID(clazz, "getPackageName", "()Ljava/lang/String;");

-    jobject result = env->CallObjectMethod(activity->clazz, methodID);

-    

-    const char* packageName;

+    /* Get external files directory on Android; this will result in a directory where all app files

+     * should be stored, like /mnt/sdcard/android/<package-name>/files/

+     */

     jboolean isCopy;

-    packageName = env->GetStringUTFChars((jstring)result, &isCopy);

-    jvm->DetachCurrentThread();

+

+    jclass clazz = env->GetObjectClass(activity->clazz);

+    jmethodID methodGetExternalStorage = env->GetMethodID(clazz, "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");

+

+    jclass clazzFile = env->FindClass("java/io/File");

+    jmethodID methodGetPath = env->GetMethodID(clazzFile, "getPath", "()Ljava/lang/String;");

+

+    // Now has java.io.File object pointing to directory

+    jobject objectFile  = env->CallObjectMethod(activity->clazz, methodGetExternalStorage, NULL);

     

+    // Now has String object containing path to directory

+    jstring stringExternalPath = static_cast<jstring>(env->CallObjectMethod(objectFile, methodGetPath));

+    const char* externalPath = env->GetStringUTFChars(stringExternalPath, &isCopy);

+

     // Set the default path to store the resources.

-    std::string assetsPath = "/mnt/sdcard/android/data/";

-    assetsPath += packageName;

-    assetsPath += "/";

+    std::string assetsPath(externalPath);

+    if (externalPath[strlen(externalPath)-1] != '/')

+        assetsPath += "/";

+

     FileSystem::setResourcePath(assetsPath.c_str());    

-        

+

+    // Release string data

+    env->ReleaseStringUTFChars(stringExternalPath, externalPath);

+    jvm->DetachCurrentThread();

+    

     // Get the asset manager to get the resources from the .apk file.

     __assetManager = activity->assetManager;

+ 5 - 1
gameplay/src/PlatformLinux.cpp
Zobrazit soubor 

@@ -513,7 +513,7 @@ Platform* Platform::create(Game* game, void* attachToWindow)
 
      
     // Get the window configuration values
 
     const char *title = NULL;
 
-    int __x = 0, __y = 0, __width = 1280, __height = 800;
 
+    int __x = 0, __y = 0, __width = 1280, __height = 800, __samples = 0;
 
     bool fullscreen = false;
 
     if (game->getConfig())
 
     {
 
@@ -528,6 +528,7 @@ Platform* Platform::create(Game* game, void* attachToWindow)
 
             int y = config->getInt("y");
 
             int width = config->getInt("width");
 
             int height = config->getInt("height");
 
+            int samples = config->getInt("samples");
 
             fullscreen = config->getBool("fullscreen");
 
 
             if (fullscreen && width == 0 && height == 0)
 
@@ -541,6 +542,7 @@ Platform* Platform::create(Game* game, void* attachToWindow)
 
             if (y != 0) __y = y;
 
             if (width != 0) __width = width;
 
             if (height != 0) __height = height;
 
+            if (samples != 0) __samples = samples;
 
         }
 
     }
 
 
@@ -578,6 +580,8 @@ Platform* Platform::create(Game* game, void* attachToWindow)
 
         GLX_GREEN_SIZE,     8,
 
         GLX_BLUE_SIZE,      8,
 
         GLX_DOUBLEBUFFER,   True,
 
+        GLX_SAMPLE_BUFFERS, __samples > 0 ? 1 : 0,
 
+        GLX_SAMPLES,        __samples,
 
         0
 
     };
 
     GLXFBConfig* configs;

+ 80 - 3
gameplay/src/PlatformiOS.mm
Zobrazit soubor 

@@ -38,6 +38,27 @@ extern const int WINDOW_SCALE = [[UIScreen mainScreen] scale];
 
 static AppDelegate *__appDelegate = NULL;
 
 static View* __view = NULL;
 
 
+class TouchPoint
 
+{
 
+public:
 
+    unsigned int hashId;
 
+    int x;
 
+    int y;
 
+    bool down;
 
+    
+    TouchPoint()
 
+    {
 
+        hashId = 0;
 
+        x = 0;
 
+        y = 0;
 
+        down = false;
 
+    }
 
+};
 
+
 
+// more than we'd ever need, to be safe
 
+#define TOUCH_POINTS_MAX (10)
 
+static TouchPoint __touchPoints[TOUCH_POINTS_MAX];
 
+
 
 static double __timeStart;
 
 static double __timeAbsolute;
 
 static bool __vsync = WINDOW_VSYNC;
 
@@ -516,7 +537,27 @@ int getUnicode(int key);
 
         {
 
             touchID = [touch hash];
 
         }
 
-        Platform::touchEventInternal(Touch::TOUCH_PRESS, touchPoint.x * WINDOW_SCALE, touchPoint.y * WINDOW_SCALE, touchID);
 
+
 
+        // Nested loop efficiency shouldn't be a concern since both loop sizes are small (<= 10)
 
+        int i = 0;
 
+        while (i < TOUCH_POINTS_MAX && __touchPoints[i].down)
 
+        {
 
+            i++;
 
+        }
 
+
 
+        if (i < TOUCH_POINTS_MAX)
 
+        {
 
+            __touchPoints[i].hashId = touchID;
 
+            __touchPoints[i].x = touchPoint.x * WINDOW_SCALE;
 
+            __touchPoints[i].y = touchPoint.y * WINDOW_SCALE;
 
+            __touchPoints[i].down = true;
 
+
 
+            Platform::touchEventInternal(Touch::TOUCH_PRESS, __touchPoints[i].x, __touchPoints[i].y, i);
 
+        }
 
+        else
 
+        {
 
+            print("touchesBegan: unable to find free element in __touchPoints");
 
+        }
 
     }
 
 }
 
 
@@ -528,7 +569,32 @@ int getUnicode(int key);
 
         CGPoint touchPoint = [touch locationInView:self];
 
         if(self.multipleTouchEnabled == YES) 
             touchID = [touch hash];
 
-        Platform::touchEventInternal(Touch::TOUCH_RELEASE, touchPoint.x * WINDOW_SCALE, touchPoint.y * WINDOW_SCALE, touchID);
 
+
 
+        // Nested loop efficiency shouldn't be a concern since both loop sizes are small (<= 10)
 
+        bool found = false;
 
+        for (int i = 0; !found && i < TOUCH_POINTS_MAX; i++)
 
+        {
 
+            if (__touchPoints[i].down && __touchPoints[i].hashId == touchID)
 
+            {
 
+                __touchPoints[i].down = false;
 
+                Platform::touchEventInternal(Touch::TOUCH_RELEASE, touchPoint.x * WINDOW_SCALE, touchPoint.y * WINDOW_SCALE, i);
 
+                found = true;
 
+            }
 
+        }
 
+        
+        if (!found)
 
+        {
 
+            // It seems possible to receive an ID not in the array.
 
+            // The best we can do is clear the whole array.
 
+            for (int i = 0; i < TOUCH_POINTS_MAX; i++)
 
+            {
 
+                if (__touchPoints[i].down)
 
+                {
 
+                    __touchPoints[i].down = false;
 
+                    Platform::touchEventInternal(Touch::TOUCH_RELEASE, __touchPoints[i].x, __touchPoints[i].y, i);
 
+                }
 
+            }
 
+        }
 
     }
 
 }
 
 
@@ -546,7 +612,18 @@ int getUnicode(int key);
 
         CGPoint touchPoint = [touch locationInView:self];
 
         if(self.multipleTouchEnabled == YES) 
             touchID = [touch hash];
 
-        Platform::touchEventInternal(Touch::TOUCH_MOVE, touchPoint.x * WINDOW_SCALE, touchPoint.y * WINDOW_SCALE, touchID);
 
+
 
+        // Nested loop efficiency shouldn't be a concern since both loop sizes are small (<= 10)
 
+        for (int i = 0; i < TOUCH_POINTS_MAX; i++)
 
+        {
 
+            if (__touchPoints[i].down && __touchPoints[i].hashId == touchID)
 
+            {
 
+                __touchPoints[i].x = touchPoint.x * WINDOW_SCALE;
 
+                __touchPoints[i].y = touchPoint.y * WINDOW_SCALE;
 
+                Platform::touchEventInternal(Touch::TOUCH_MOVE, __touchPoints[i].x, __touchPoints[i].y, i);
 
+                break;
 
+            }
 
+        }
 
     }
 
 }

+ 1 - 1
gameplay/src/RadioButton.h
Zobrazit soubor 

@@ -136,7 +136,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by the control.

      *

+ 8 - 0
gameplay/src/RenderState.cpp
Zobrazit soubor 

@@ -556,6 +556,14 @@ static RenderState::Blend parseBlend(const char* value)
 
         return RenderState::BLEND_ZERO;

     else if (upper == "ONE")

         return RenderState::BLEND_ONE;

+    else if (upper == "SRC_COLOR")

+        return RenderState::BLEND_SRC_COLOR;

+    else if (upper == "ONE_MINUS_SRC_COLOR")

+        return RenderState::BLEND_ONE_MINUS_SRC_COLOR;

+    else if (upper == "DST_COLOR")

+        return RenderState::BLEND_DST_COLOR;

+    else if (upper == "ONE_MINUS_DST_COLOR")

+        return RenderState::BLEND_ONE_MINUS_DST_COLOR;

     else if (upper == "SRC_ALPHA")

         return RenderState::BLEND_SRC_ALPHA;

     else if (upper == "ONE_MINUS_SRC_ALPHA")

+ 1 - 1
gameplay/src/RenderState.h
Zobrazit soubor 

@@ -134,7 +134,7 @@ public:
 
         BLEND_ZERO = GL_ZERO,

         BLEND_ONE = GL_ONE,

         BLEND_SRC_COLOR = GL_SRC_COLOR,

-        BLEN_ONE_MINUS_SRC_COLOR = GL_ONE_MINUS_SRC_COLOR,

+        BLEND_ONE_MINUS_SRC_COLOR = GL_ONE_MINUS_SRC_COLOR,

         BLEND_DST_COLOR = GL_DST_COLOR,

         BLEND_ONE_MINUS_DST_COLOR = GL_ONE_MINUS_DST_COLOR,

         BLEND_SRC_ALPHA = GL_SRC_ALPHA,

+ 1 - 1
gameplay/src/ScriptController.h
Zobrazit soubor 

@@ -811,7 +811,7 @@ private:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @see Touch::TouchEvent

      */

+ 1 - 1
gameplay/src/Slider.h
Zobrazit soubor 

@@ -192,7 +192,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by the control.

      *

+ 1 - 1
gameplay/src/TextBox.h
Zobrazit soubor 

@@ -102,7 +102,7 @@ protected:
 
      * @param evt The touch event that occurred.

      * @param x The x position of the touch in pixels. Left edge is zero.

      * @param y The y position of the touch in pixels. Top edge is zero.

-     * @param contactIndex An integer to identify this contact point within the currently active touch set.

+     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.

      *

      * @return Whether the touch event was consumed by the control.

      *

+ 1 - 1
gameplay/src/lua/lua_Global.cpp
Zobrazit soubor 

@@ -730,7 +730,7 @@ void luaRegister_lua_Global()
 
         ScriptUtil::registerConstantString("BLEND_ZERO", "BLEND_ZERO", scopePath);

         ScriptUtil::registerConstantString("BLEND_ONE", "BLEND_ONE", scopePath);

         ScriptUtil::registerConstantString("BLEND_SRC_COLOR", "BLEND_SRC_COLOR", scopePath);

-        ScriptUtil::registerConstantString("BLEN_ONE_MINUS_SRC_COLOR", "BLEN_ONE_MINUS_SRC_COLOR", scopePath);

+        ScriptUtil::registerConstantString("BLEND_ONE_MINUS_SRC_COLOR", "BLEND_ONE_MINUS_SRC_COLOR", scopePath);

         ScriptUtil::registerConstantString("BLEND_DST_COLOR", "BLEND_DST_COLOR", scopePath);

         ScriptUtil::registerConstantString("BLEND_ONE_MINUS_DST_COLOR", "BLEND_ONE_MINUS_DST_COLOR", scopePath);

         ScriptUtil::registerConstantString("BLEND_SRC_ALPHA", "BLEND_SRC_ALPHA", scopePath);

+ 5 - 5
gameplay/src/lua/lua_RenderStateBlend.cpp
Zobrazit soubor 

@@ -9,7 +9,7 @@ static const char* enumStringEmpty = "";
 
 static const char* luaEnumString_RenderStateBlend_BLEND_ZERO = "BLEND_ZERO";

 static const char* luaEnumString_RenderStateBlend_BLEND_ONE = "BLEND_ONE";

 static const char* luaEnumString_RenderStateBlend_BLEND_SRC_COLOR = "BLEND_SRC_COLOR";

-static const char* luaEnumString_RenderStateBlend_BLEN_ONE_MINUS_SRC_COLOR = "BLEN_ONE_MINUS_SRC_COLOR";

+static const char* luaEnumString_RenderStateBlend_BLEND_ONE_MINUS_SRC_COLOR = "BLEND_ONE_MINUS_SRC_COLOR";

 static const char* luaEnumString_RenderStateBlend_BLEND_DST_COLOR = "BLEND_DST_COLOR";

 static const char* luaEnumString_RenderStateBlend_BLEND_ONE_MINUS_DST_COLOR = "BLEND_ONE_MINUS_DST_COLOR";

 static const char* luaEnumString_RenderStateBlend_BLEND_SRC_ALPHA = "BLEND_SRC_ALPHA";

@@ -28,8 +28,8 @@ RenderState::Blend lua_enumFromString_RenderStateBlend(const char* s)
 
         return RenderState::BLEND_ONE;

     if (strcmp(s, luaEnumString_RenderStateBlend_BLEND_SRC_COLOR) == 0)

         return RenderState::BLEND_SRC_COLOR;

-    if (strcmp(s, luaEnumString_RenderStateBlend_BLEN_ONE_MINUS_SRC_COLOR) == 0)

-        return RenderState::BLEN_ONE_MINUS_SRC_COLOR;

+    if (strcmp(s, luaEnumString_RenderStateBlend_BLEND_ONE_MINUS_SRC_COLOR) == 0)

+        return RenderState::BLEND_ONE_MINUS_SRC_COLOR;

     if (strcmp(s, luaEnumString_RenderStateBlend_BLEND_DST_COLOR) == 0)

         return RenderState::BLEND_DST_COLOR;

     if (strcmp(s, luaEnumString_RenderStateBlend_BLEND_ONE_MINUS_DST_COLOR) == 0)

@@ -60,8 +60,8 @@ const char* lua_stringFromEnum_RenderStateBlend(RenderState::Blend e)
 
         return luaEnumString_RenderStateBlend_BLEND_ONE;

     if (e == RenderState::BLEND_SRC_COLOR)

         return luaEnumString_RenderStateBlend_BLEND_SRC_COLOR;

-    if (e == RenderState::BLEN_ONE_MINUS_SRC_COLOR)

-        return luaEnumString_RenderStateBlend_BLEN_ONE_MINUS_SRC_COLOR;

+    if (e == RenderState::BLEND_ONE_MINUS_SRC_COLOR)

+        return luaEnumString_RenderStateBlend_BLEND_ONE_MINUS_SRC_COLOR;

     if (e == RenderState::BLEND_DST_COLOR)

         return luaEnumString_RenderStateBlend_BLEND_DST_COLOR;

     if (e == RenderState::BLEND_ONE_MINUS_DST_COLOR)