Ver Fonte

Update porting notes. Rename UpdateEvent::USE_NONE to UpdateEvent::USE_NO_EVENT.

Eugene Kozlov há 7 anos atrás
pai
commit
a144206e27

+ 1 - 0
Docs/Urho3D.dox

@@ -1377,6 +1377,7 @@ From 1.7 to master:
 - The Color::TRANSPARENT constant is renamed to Color::TRANSPARENT_BLACK to avoid name clash with Windows's TRANSPARENT macro defined in "windows.h".
 - Build system - the Android Java classes started to use Java 7 and 8 language features, so they must be built with Java 8 support turned on.
 - Build system - introduce a new Emscripten-specific build option "EMSCRIPTEN_AUTO_SHELL" (default to TRUE), which cause the build system to automatically add an HTML shell-file if one is not explicitly given. Also set the default for "EMSCRIPTEN_WASM" build option to TRUE in order to align with the upstream EMCC compiler changes.
+- Constants are replaced with enums and flag sets in multiple places. Use corresponding types and typed constants instead of integers and integer constants. For example, "unsigned vertexMask = MASK_POSITION" becomes "VertexMaskFlags vertexMask = MASK_POSITION" and "input->GetKeyDown('A')" becomes "input->GetKeyDown(KEY_A)".
 
 */
 

+ 1 - 1
Source/Urho3D/Scene/LogicComponent.cpp

@@ -99,7 +99,7 @@ void LogicComponent::OnSceneSet(Scene* scene)
         UnsubscribeFromEvent(E_PHYSICSPRESTEP);
         UnsubscribeFromEvent(E_PHYSICSPOSTSTEP);
 #endif
-        currentEventMask_ = USE_NONE;
+        currentEventMask_ = USE_NO_EVENT;
     }
 }
 

+ 1 - 1
Source/Urho3D/Scene/LogicComponent.h

@@ -31,7 +31,7 @@ namespace Urho3D
 enum UpdateEvent : unsigned
 {
     /// Bitmask for not using any events.
-    USE_NONE = 0x0,
+    USE_NO_EVENT = 0x0,
     /// Bitmask for using the scene update event.
     USE_UPDATE = 0x1,
     /// Bitmask for using the scene post-update event.