min

oxygine/src/InputText.cpp

@@ -54,7 +54,7 @@ namespace oxygine
             fs = _textActor->getFont()->getSize();
         float h = fs * 0.9f;
         _cursor->setSize(h / 10.0f, h);
-        
+
         _cursor->setColor(_textActor->getColor() * _textActor->getStyle().color);
 
         core::getDispatcher()->addEventListener(core::EVENT_SYSTEM, CLOSURE(this, &InputText::_onSysEvent));
@@ -119,7 +119,7 @@ namespace oxygine
         _textActor->setText(_txt);
         float x = _textActor->getTextRect().getRight();
         _cursor->setX(x);
-        
+
 
         Event evnt(EVENT_TEXT_CHANGED);
         dispatchEvent(&evnt);

oxygine/src/Property.h

@@ -32,6 +32,16 @@ namespace oxygine
             set(t, _dest);
         }
 
+        const value& getDest() const
+        {
+            return _dest;
+        }
+
+        const value& getSrc() const
+        {
+            return _src;
+        }
+
         void update(type& t, float p, const UpdateState& us)
         {
             OX_ASSERT(_initialized);

oxygine/src/core/oxygine.cpp

@@ -78,14 +78,15 @@ extern "C"
 
 void emscStackTrace()
 {
-    EM_ASM({
+    EM_ASM(
+    {
         console.log(new Error().stack);
         /*
         try {
             throw new Error();
         } catch (e) {
             print(e.stack);
-        } 
+        }
         */
     });
 }

oxygine/src/json/json-forwards.h

@@ -7,28 +7,28 @@
 // //////////////////////////////////////////////////////////////////////
 
 /*
-The JsonCpp library's source code, including accompanying documentation, 
+The JsonCpp library's source code, including accompanying documentation,
 tests and demonstration applications, are licensed under the following
 conditions...
 
-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all 
-jurisdictions which recognize such a disclaimer. In such jurisdictions, 
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
+jurisdictions which recognize such a disclaimer. In such jurisdictions,
 this software is released into the Public Domain.
 
 In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
 2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
 The JsonCpp Authors, and is released under the terms of the MIT License (see below).
 
-In jurisdictions which recognize Public Domain property, the user of this 
-software may choose to accept it either as 1) Public Domain, 2) under the 
-conditions of the MIT License (see below), or 3) under the terms of dual 
+In jurisdictions which recognize Public Domain property, the user of this
+software may choose to accept it either as 1) Public Domain, 2) under the
+conditions of the MIT License (see below), or 3) under the terms of dual
 Public Domain/MIT License conditions described here, as they choose.
 
 The MIT License is about as close to Public Domain as a license can get, and is
 described in clear, concise terms at:
 
    http://en.wikipedia.org/wiki/MIT_License
-   
+
 The full text of the MIT License follows:
 
 ========================================================================
@@ -146,18 +146,18 @@ license you like.
 
 #if defined(_MSC_VER) // MSVC
 #  if _MSC_VER <= 1200 // MSVC 6
-    // Microsoft Visual Studio 6 only support conversion from __int64 to double
-    // (no conversion from unsigned __int64).
+// Microsoft Visual Studio 6 only support conversion from __int64 to double
+// (no conversion from unsigned __int64).
 #    define JSON_USE_INT64_DOUBLE_CONVERSION 1
-    // Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
-    // characters in the debug information)
-    // All projects I've ever seen with VS6 were using this globally (not bothering
-    // with pragma push/pop).
+// Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
+// characters in the debug information)
+// All projects I've ever seen with VS6 were using this globally (not bothering
+// with pragma push/pop).
 #    pragma warning(disable : 4786)
 #  endif // MSVC 6
 
 #  if _MSC_VER >= 1500 // MSVC 2008
-    /// Indicates that the following function is deprecated.
+/// Indicates that the following function is deprecated.
 #    define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
 #  endif
 
@@ -234,24 +234,25 @@ license you like.
 
 #endif // if !defined(JSON_IS_AMALGAMATION)
 
-namespace Json {
-typedef int Int;
-typedef unsigned int UInt;
+namespace Json
+{
+    typedef int Int;
+    typedef unsigned int UInt;
 #if defined(JSON_NO_INT64)
-typedef int LargestInt;
-typedef unsigned int LargestUInt;
+    typedef int LargestInt;
+    typedef unsigned int LargestUInt;
 #undef JSON_HAS_INT64
 #else                 // if defined(JSON_NO_INT64)
 // For Microsoft Visual use specific types as long long is not supported
 #if defined(_MSC_VER) // Microsoft Visual Studio
-typedef __int64 Int64;
-typedef unsigned __int64 UInt64;
+    typedef __int64 Int64;
+    typedef unsigned __int64 UInt64;
 #else                 // if defined(_MSC_VER) // Other platforms, use long long
-typedef int64_t Int64;
-typedef uint64_t UInt64;
+    typedef int64_t Int64;
+    typedef uint64_t UInt64;
 #endif // if defined(_MSC_VER)
-typedef Int64 LargestInt;
-typedef UInt64 LargestUInt;
+    typedef Int64 LargestInt;
+    typedef UInt64 LargestUInt;
 #define JSON_HAS_INT64
 #endif // if defined(JSON_NO_INT64)
 #if JSONCPP_USING_SECURE_MEMORY
@@ -296,27 +297,28 @@ typedef UInt64 LargestUInt;
 #include "config.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
 
-namespace Json {
+namespace Json
+{
 
 // writer.h
-class FastWriter;
-class StyledWriter;
+    class FastWriter;
+    class StyledWriter;
 
 // reader.h
-class Reader;
+    class Reader;
 
 // features.h
-class Features;
+    class Features;
 
 // value.h
-typedef unsigned int ArrayIndex;
-class StaticString;
-class Path;
-class PathArgument;
-class Value;
-class ValueIteratorBase;
-class ValueIterator;
-class ValueConstIterator;
+    typedef unsigned int ArrayIndex;
+    class StaticString;
+    class Path;
+    class PathArgument;
+    class Value;
+    class ValueIteratorBase;
+    class ValueIterator;
+    class ValueConstIterator;
 
 } // namespace Json