Home Explore Help
Sign In
cpp
/
AtomicGameEngine
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Updates

Josh Engebretson 10 years ago
parent
6a3bb21e85
commit
833c37b037
4 changed files with 18 additions and 31 deletions
Unified View Show Diff Stats
  1. 10 1
      Data/AtomicEditor/Deployment/Web/AtomicPlayer.html
  2. 2 2
      Source/Atomic/Graphics/OpenGL/OGLGraphics.cpp
  3. 0 21
      Source/AtomicEditor/Source/Build/BuildSystem.cpp
  4. 6 7
      Source/AtomicPlayer/AtomicPlayer.cpp

+ 10 - 1
Data/AtomicEditor/Deployment/Web/AtomicPlayer.html
View File 

@@ -3,7 +3,16 @@
 
   <head>
 
   <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
-    <title>Emscripten-Generated Code</title>
 
+    <title>Atomic Web Player</title>
 
+
 
+    <script>window.addEventListener("keydown", function(e) {
 
+    // Disable stock behavior, which was causing scroll errors
 
+    // space and arrow keys
 
+    if([32, 37, 38, 39, 40].indexOf(e.keyCode) > -1) {
 
+        e.preventDefault();
 
+    }
 
+    }, false);</script>
 
+
 
     <style>
 
     <style>
 
       body {
 
       body {
 
         font-family: arial;
 
         font-family: arial;

+ 2 - 2
Source/Atomic/Graphics/OpenGL/OGLGraphics.cpp
View File 

@@ -329,8 +329,8 @@ bool Graphics::SetMode(int width, int height, bool fullscreen, bool borderless,
 
         fullscreen = false;

         fullscreen = false;

 

 

     multiSample = Clamp(multiSample, 1, 16);

     multiSample = Clamp(multiSample, 1, 16);

-bool isInitialized = IsInitialized();

-LOGINFO(isInitialized ? "isInitialized == true" : "isInitialized == false");

+    bool isInitialized = IsInitialized();

+    LOGINFO(isInitialized ? "isInitialized == true" : "isInitialized == false");

 

 

     

     

     //if (IsInitialized() && width == width_ && height == height_ && fullscreen == fullscreen_ && borderless == borderless_ && resizable == resizable_ &&

     //if (IsInitialized() && width == width_ && height == height_ && fullscreen == fullscreen_ && borderless == borderless_ && resizable == resizable_ &&

+ 0 - 21
Source/AtomicEditor/Source/Build/BuildSystem.cpp
View File 

@@ -91,27 +91,6 @@ void BuildSystem::HandleEditorBuild(StringHash eventType, VariantMap& eventData)
 
     Editor* editor = GetSubsystem<Editor>();
 
     Editor* editor = GetSubsystem<Editor>();
 
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
 
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
 
 
 
-    // OK, we need to redo this as can't be removing folders like this
 
-    if (buildPlatform != "Web") // removing the folder is screwing up the simple web server I am using
 
-    {
 
-        if (fileSystem->DirExists(buildPath) || fileSystem->FileExists(buildPath))
 
-        {
 
-            bool result;
 
-
 
-            if (fileSystem->DirExists(buildPath))
 
-                result = fileSystem->RemoveDir(buildPath, true);
 
-            else
 
-                result = fileSystem->Delete(buildPath);
 
-
 
-            if (!result)
 
-            {
 
-                editor->PostModalError("Build Path Exists", ToString("The build path:\n\n%s\n\nalready exists and failed to be removed", buildPath.CString()));
 
-                return;
 
-            }
 
-
 
-        }
 
-    }
 
-
 
     if (buildPlatform == "Mac")
 
     if (buildPlatform == "Mac")
 
     {
 
     {
 
         DoBuildMac(buildPath);
 
         DoBuildMac(buildPath);

+ 6 - 7
Source/AtomicPlayer/AtomicPlayer.cpp
View File 

@@ -55,18 +55,18 @@ AtomicPlayer::AtomicPlayer(Context* context) :
 
 void AtomicPlayer::Setup()

 void AtomicPlayer::Setup()

 {

 {

     FileSystem* filesystem = GetSubsystem<FileSystem>();

     FileSystem* filesystem = GetSubsystem<FileSystem>();

-

-#ifdef EMSCRIPTEN

-    engineParameters_["WindowWidth"] = 1280;

-    engineParameters_["WindowHeight"] = 720;

-    engineParameters_["FullScreen"] = false;

-#endif

     

     

     engineParameters_["WindowTitle"] = "AtomicPlayer";

     engineParameters_["WindowTitle"] = "AtomicPlayer";

 

 

 #if (ATOMIC_PLATFORM_ANDROID)

 #if (ATOMIC_PLATFORM_ANDROID)

     engineParameters_["FullScreen"] = true;

     engineParameters_["FullScreen"] = true;

     engineParameters_["ResourcePaths"] = "CoreData;Data;AtomicResources";

     engineParameters_["ResourcePaths"] = "CoreData;Data;AtomicResources";

+#elif ATOMIC_PLATFORM_WEB

+    engineParameters_["FullScreen"] = false;

+    engineParameters_["ResourcePaths"] = "AtomicResources";

+    engineParameters_["WindowWidth"] = 1280;

+    engineParameters_["WindowHeight"] = 720;

+

 #else

 #else

     engineParameters_["ResourcePaths"] = "AtomicResources";

     engineParameters_["ResourcePaths"] = "AtomicResources";

     engineParameters_["FullScreen"] = false;

     engineParameters_["FullScreen"] = false;

@@ -82,7 +82,6 @@ void AtomicPlayer::Setup()
 
     engineParameters_["ResourcePrefixPath"] = "../Resources";

     engineParameters_["ResourcePrefixPath"] = "../Resources";

 #endif

 #endif

 

 

-

     // Use the script file name as the base name for the log file

     // Use the script file name as the base name for the log file

     engineParameters_["LogName"] = filesystem->GetAppPreferencesDir("AtomicPlayer", "Logs") + "AtomicPlayer.log";

     engineParameters_["LogName"] = filesystem->GetAppPreferencesDir("AtomicPlayer", "Logs") + "AtomicPlayer.log";

 }

 }