Browse Source

Fixing Windows compile (under VS2015)

JoshEngebretson 10 years ago
parent
commit
7ca8f5c03b

+ 2 - 2
Source/Atomic/UI/UIDragDrop.cpp

@@ -17,9 +17,9 @@
 #include "UIDragObject.h"
 #include "UIDragObject.h"
 
 
 #ifdef ATOMIC_PLATFORM_OSX
 #ifdef ATOMIC_PLATFORM_OSX
-
 #include "UIDragDropMac.h"
 #include "UIDragDropMac.h"
-
+#elif ATOMIC_PLATFORM_WINDOWS
+#include "UIDragDropWindows.h"
 #endif
 #endif
 
 
 using namespace tb;
 using namespace tb;

+ 18 - 0
Source/Atomic/UI/UIDragDropWindows.cpp

@@ -0,0 +1,18 @@
+
+#include <Atomic/IO/Log.h>
+#include <Atomic/Input/InputEvents.h>
+#include <Atomic/Graphics/Graphics.h>
+
+#include "UIDragDrop.h"
+#include "UIDragDropMac.h"
+
+namespace Atomic
+{
+
+	void InitDragAndDrop(UIDragDrop *dragAndDrop)
+    {
+
+
+    }
+
+}

+ 11 - 0
Source/Atomic/UI/UIDragDropWindows.h

@@ -0,0 +1,11 @@
+
+#pragma once
+
+namespace Atomic
+{
+
+class UIDragDrop;
+
+void InitDragAndDrop(UIDragDrop *dragAndDrop);
+
+}

+ 3 - 3
Source/AtomicEditorWork/Editors/SceneEditor3D/SceneEditor3D.cpp

@@ -54,8 +54,8 @@ SceneEditor3D ::SceneEditor3D(Context* context, const String &fullpath, UITabCon
     // EARLY ACCESS
     // EARLY ACCESS
     if (fullpath.Find(String("ToonTown")) != String::NPOS)
     if (fullpath.Find(String("ToonTown")) != String::NPOS)
     {
     {
-          sceneView_->GetCameraNode()->SetWorldPosition(Vector3(-119.073, 76.1121, 16.47763));
-          Quaternion q(0.55, 0.14,  0.8, -0.2);
+          sceneView_->GetCameraNode()->SetWorldPosition(Vector3(-119.073f, 76.1121f, 16.47763f));
+          Quaternion q(0.55f, 0.14f,  0.8f, -0.2f);
           sceneView_->SetYaw(q.YawAngle());
           sceneView_->SetYaw(q.YawAngle());
           sceneView_->SetPitch(q.PitchAngle());
           sceneView_->SetPitch(q.PitchAngle());
           sceneView_->GetCameraNode()->SetWorldRotation(q);
           sceneView_->GetCameraNode()->SetWorldRotation(q);
@@ -187,7 +187,7 @@ void SceneEditor3D::HandlePlayStopped(StringHash eventType, VariantMap& eventDat
 
 
 void SceneEditor3D::HandleGizmoEditModeChanged(StringHash eventType, VariantMap& eventData)
 void SceneEditor3D::HandleGizmoEditModeChanged(StringHash eventType, VariantMap& eventData)
 {
 {
-    EditMode mode = (EditMode) eventData[GizmoEditModeChanged::P_MODE].GetFloat();
+    EditMode mode = (EditMode) ((int)eventData[GizmoEditModeChanged::P_MODE].GetFloat());
     gizmo3D_->SetEditMode(mode);
     gizmo3D_->SetEditMode(mode);
 }
 }
 
 

+ 1 - 1
Source/AtomicJS/Javascript/JSGraphics.cpp

@@ -91,7 +91,7 @@ static int Material_GetShaderParameters(duk_context* ctx)
 
 
 static int Material_GetTextureUnitName(duk_context* ctx)
 static int Material_GetTextureUnitName(duk_context* ctx)
 {
 {
-    duk_push_string(ctx, Material::GetTextureUnitName((TextureUnit) duk_get_number(ctx, 0)).CString());
+    duk_push_string(ctx, Material::GetTextureUnitName((TextureUnit) ((int) duk_get_number(ctx, 0))).CString());
     return 1;
     return 1;
 }
 }
 
 

+ 2 - 1
Source/ToolCore/Assets/AssetDatabase.cpp

@@ -4,6 +4,7 @@
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/File.h>
 #include <Atomic/IO/File.h>
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/IO/FileSystem.h>
+#include <Atomic/Math/Random.h>
 
 
 #include <Atomic/Resource/ResourceCache.h>
 #include <Atomic/Resource/ResourceCache.h>
 
 
@@ -47,7 +48,7 @@ String AssetDatabase::GenerateAssetGUID()
 
 
         for (unsigned i = 0; i < 16; i++)
         for (unsigned i = 0; i < 16; i++)
         {
         {
-            data.Push(time->GetTimeSinceEpoch() + random() % 65535);
+            data.Push(time->GetTimeSinceEpoch() + Rand());
         }
         }
 
 
         md5.update(&data[0], data.Size() * sizeof(unsigned));
         md5.update(&data[0], data.Size() * sizeof(unsigned));