Browse Source

Update to the latest (and greatest) Duktape master

Josh Engebretson 10 năm trước cách đây
mục cha
commit
e87f0d7b75

+ 3 - 0
Script/TypeScript/AtomicPlayer.d.ts

@@ -13,10 +13,13 @@ declare module AtomicPlayer {
 
    export class Player extends Atomic.AObject {
 
+      currentScene: Atomic.Scene;
+
       // Construct.
       constructor();
 
       loadScene(filename: string, camera?: Atomic.Camera): Atomic.Scene;
+      getCurrentScene(): Atomic.Scene;
 
    }
 

+ 14 - 0
Source/ThirdParty/Duktape/duk_config.h

@@ -465,6 +465,20 @@ static __inline__ unsigned long long duk_rdtsc(void) {
  */
 #include <windows.h>
 #include <limits.h>
+// ATOMIC BEGIN
+#ifdef GetObject
+#undef GetObject
+#endif
+#ifdef MessageBox
+#undef MessageBox
+#endif
+#ifdef GetMessage
+#undef GetMessage
+#endif
+#ifdef FindText
+#undef FindText
+#endif
+// ATOMIC END
 #elif defined(DUK_F_FLASHPLAYER)
 /* Crossbridge */
 #define DUK_USE_DATE_NOW_GETTIMEOFDAY

+ 1 - 1
Source/ThirdParty/Duktape/duktape.c

@@ -1,6 +1,6 @@
 /*
  *  Single file autogenerated distributable for Duktape 1.2.99.
- *  Git commit b098f0423266f5dbfd7a67fc3a6146455df9b61c (v1.2.0-257-gb098f04).
+ *  Git commit b098f0423266f5dbfd7a67fc3a6146455df9b61c (v1.2.0-257-gb098f04-dirty).
  *
  *  See Duktape AUTHORS.rst and LICENSE.txt for copyright and
  *  licensing information.

+ 9 - 2
Source/ThirdParty/Duktape/duktape.h

@@ -5,7 +5,7 @@
  *  include guard.  Other parts of the header are Duktape
  *  internal and related to platform/compiler/feature detection.
  *
- *  Git commit b098f0423266f5dbfd7a67fc3a6146455df9b61c (v1.2.0-257-gb098f04).
+ *  Git commit b098f0423266f5dbfd7a67fc3a6146455df9b61c (v1.2.0-257-gb098f04-dirty).
  *
  *  See Duktape AUTHORS.rst and LICENSE.txt for copyright and
  *  licensing information.
@@ -112,6 +112,13 @@
 
 #define DUK_SINGLE_FILE
 
+// ATOMIC BEGIN
+
+// ensure option is also enabled in Duktape's Makefile for building dist!
+#define DUK_OPT_NO_VOLUNTARY_GC
+
+// ATOMIC END
+
 /* External duk_config.h provides platform/compiler/OS dependent
  * typedefs and macros, and DUK_USE_xxx config options so that
  * the rest of Duktape doesn't need to do any feature detection.
@@ -212,7 +219,7 @@ struct duk_number_list_entry {
  * so that application code can easily log which Duktape snapshot was used.
  * Not available in the Ecmascript environment.
  */
-#define DUK_GIT_DESCRIBE                  "v1.2.0-257-gb098f04"
+#define DUK_GIT_DESCRIBE                  "v1.2.0-257-gb098f04-dirty"
 
 /* Duktape debug protocol version used by this build. */
 #define DUK_DEBUG_PROTOCOL_VERSION        1