Browse Source

Web platform work

Josh Engebretson 11 years ago
parent
commit
fafa22313a
2 changed files with 4 additions and 15 deletions
  1. 1 1
      Rakefile
  2. 3 14
      Source/Tools/AtomicPlayer/AtomicPlayer.cpp

+ 1 - 1
Rakefile

@@ -57,7 +57,7 @@ namespace :web do
 
 
     Dir.chdir("#{CMAKE_WEB_BUILD_FOLDER}/Source/Tools/AtomicPlayer") do
     Dir.chdir("#{CMAKE_WEB_BUILD_FOLDER}/Source/Tools/AtomicPlayer") do
       sh "mv AtomicPlayer AtomicPlayer.bc"
       sh "mv AtomicPlayer AtomicPlayer.bc"
-      sh "emcc -O3 --llvm-lto 1 --memory-init-file 0 -s VERBOSE=0 -s USE_SDL=2 -s ASM_JS=1 -s ASSERTIONS=1 -s OUTLINING_LIMIT=20000 -s TOTAL_MEMORY=520093696 --closure 0 ./AtomicPlayer.bc -o  ./AtomicPlayer.html"      
+      sh "emcc -O3 --llvm-lto 1 --memory-init-file 0 -s VERBOSE=0 -s USE_SDL=2 -s ASM_JS=1 -s ASSERTIONS=1 -s OUTLINING_LIMIT=20000 -s TOTAL_MEMORY=520093696 --closure 0 ./AtomicPlayer.bc -o  ./AtomicPlayer.html"
     end
     end
 
 
   end
   end

+ 3 - 14
Source/Tools/AtomicPlayer/AtomicPlayer.cpp

@@ -108,18 +108,6 @@ void AtomicPlayer::Setup()
 {
 {
     FileSystem* filesystem = GetSubsystem<FileSystem>();       
     FileSystem* filesystem = GetSubsystem<FileSystem>();       
 
 
-    // On Android and iOS, read command line from a file as parameters can not otherwise be easily given
-/*
-    #if defined(ANDROID) || defined(IOS)
-    SharedPtr<File> commandFile(new File(context_, filesystem->GetProgramDir() + "Data/CommandLine.txt",
-        FILE_READ));
-    String commandLine = commandFile->ReadLine();
-    commandFile->Close();
-    ParseArguments(commandLine, false);
-    // Reparse engine startup parameters now
-    engineParameters_ = Engine::ParseParameters(GetArguments());
-    #endif
-*/
     // Check for script file name
     // Check for script file name
     const Vector<String>& arguments = GetArguments();    
     const Vector<String>& arguments = GetArguments();    
     for (unsigned i = 0; i < arguments.Size(); ++i)
     for (unsigned i = 0; i < arguments.Size(); ++i)
@@ -135,9 +123,8 @@ void AtomicPlayer::Setup()
     engineParameters_["WindowWidth"] = 1280;
     engineParameters_["WindowWidth"] = 1280;
     engineParameters_["WindowHeight"] = 720;
     engineParameters_["WindowHeight"] = 720;
     engineParameters_["FullScreen"] = false;    
     engineParameters_["FullScreen"] = false;    
-    scriptFileName_ = "PhysicsPlatformer.js";
-
 #endif
 #endif
+    
     scriptFileName_ = "Script/Main.js";
     scriptFileName_ = "Script/Main.js";
 
 
     FileSystem* fileSystem = GetSubsystem<FileSystem>();    
     FileSystem* fileSystem = GetSubsystem<FileSystem>();    
@@ -146,6 +133,8 @@ void AtomicPlayer::Setup()
 #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_["ResourcePaths"] = "CoreData;Data;AtomicResources";
 #else
 #else
     engineParameters_["ResourcePaths"] = "AtomicResources";
     engineParameters_["ResourcePaths"] = "AtomicResources";
     engineParameters_["FullScreen"] = false;
     engineParameters_["FullScreen"] = false;