diff --git a/.gitignore b/.gitignore index adcb93ec6..3346381d4 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,9 @@ Tests/*Cases/*.js /jsil.org/demos/Sully/*.js /jsil.org/demos/Sully/Content /jsil.org/demos/Soulcaster/*.js -/jsil.org/demos/Soulcaster/Soulcaster2Content +/jsil.org/demos/Soulcaster/Soulcaster1Content +/jsil.org/demos/Soulcaster2/*.js +/jsil.org/demos/Soulcaster2/Soulcaster2Content /jsil.org/demos/RPG/Content /jsil.org/demos/GameType/*.js /jsil.org/demos/GameType/Content diff --git a/Libraries/JSIL.Bootstrap.js b/Libraries/JSIL.Bootstrap.js index 1e8224b05..ce24eb1aa 100644 --- a/Libraries/JSIL.Bootstrap.js +++ b/Libraries/JSIL.Bootstrap.js @@ -1073,6 +1073,25 @@ JSIL.ImplementExternals( } ); +JSIL.ImplementExternals( + "System.IO.FileNotFoundException", function ($) { + $.Method({Static:false, Public:true }, ".ctor", + new JSIL.MethodSignature(null, [$.String], []), + function (message) { + System.Exception.prototype._ctor.call(this, message); + } + ); + + $.Method({Static:false, Public:true }, ".ctor", + (new JSIL.MethodSignature(null, [$.String, $.String], [])), + function _ctor (message, fileName) { + System.Exception.prototype._ctor.call(this, message); + this._fileName = fileName; + } + ); + } +); + JSIL.MakeClass(Error, "System.Exception", true, [], function ($) { $.Property({Public: true , Static: false, Virtual: true }, "Message"); $.Property({Public: true , Static: false}, "InnerException"); @@ -1080,6 +1099,7 @@ JSIL.MakeClass(Error, "System.Exception", true, [], function ($) { JSIL.MakeClass("System.Exception", "System.InvalidCastException", true); JSIL.MakeClass("System.Exception", "System.InvalidOperationException", true); +JSIL.MakeClass("System.Exception", "System.IO.FileNotFoundException", true); JSIL.ImplementExternals("System.Console", function ($) { $.RawMethod(true, "WriteLine", function () { diff --git a/Libraries/JSIL.Browser.js b/Libraries/JSIL.Browser.js index e22bd85f2..170c55a87 100644 --- a/Libraries/JSIL.Browser.js +++ b/Libraries/JSIL.Browser.js @@ -92,14 +92,15 @@ JSIL.Host.getFile = function (filename) { } if (!JSIL.Host.doesFileExist(filename)) - throw new System.Exception(errorMessage); + throw new System.IO.FileNotFoundException(errorMessage, filename); return allFiles[JSIL.Host.translateFilename(filename)]; }; JSIL.Host.getImage = function (filename) { var key = getAssetName(filename, false); if (!allAssets.hasOwnProperty(key)) - throw new System.Exception("The image '" + key + "' is not in the asset manifest."); + throw new System.IO.FileNotFoundException("The image '" + key + "' is not in the asset manifest.", filename); + return allAssets[key].image; }; JSIL.Host.doesAssetExist = function (filename, stripRoot) { @@ -130,7 +131,7 @@ JSIL.Host.getAsset = function (filename, stripRoot) { var key = getAssetName(filename, false); if (!allAssets.hasOwnProperty(key)) - throw new System.Exception("The asset '" + key + "' is not in the asset manifest."); + throw new System.IO.FileNotFoundException("The asset '" + key + "' is not in the asset manifest.", filename); return allAssets[key]; }; diff --git a/build_demos.bat b/build_demos.bat index 2326f4d9a..205228824 100644 --- a/build_demos.bat +++ b/build_demos.bat @@ -1,8 +1,9 @@ pushd bin del /s/q ..\jsil.org\demos\*.js JSILc "C:\Users\Kevin\Documents\Projects\EscapeGoat\bastille\bastille.sln" "C:\Users\Kevin\Documents\Projects\EscapeGoat\bastille\Bastille\Bastille\bin\x86\DebugPC\EscapeGoat.XmlSerializers.dll" "C:\Users\Kevin\Documents\Projects\JSIL\jsil.org\demos\EscapeGoat\EscapeGoat.jsilconfig" --platform:x86 --configuration:DebugPC +JSILc "C:\Users\Kevin\Documents\Projects\Soulcaster\Soulcaster1HTML5.sln" "C:\Users\Kevin\Documents\Projects\Soulcaster\Soulcaster1\Soulcaster1\bin\x86\DebugPC\TarchonData.XmlSerializers.dll" "C:\Users\Kevin\Documents\Projects\JSIL\jsil.org\demos\Soulcaster\Soulcaster.jsilconfig" --platform:x86 --configuration:DebugPC +JSILc "C:\Users\Kevin\Documents\Projects\Soulcaster\Soulcaster2HTML5.sln" "C:\Users\Kevin\Documents\Projects\Soulcaster\Soulcaster2\Soulcaster2\bin\x86\DebugPC\TarchonData.XmlSerializers.dll" "C:\Users\Kevin\Documents\Projects\JSIL\jsil.org\demos\Soulcaster2\Soulcaster2.jsilconfig" --platform:x86 --configuration:DebugPC JSILc "C:\Game Design\Game Type\CodeNew\GameType\GameType.sln" "C:\Users\Kevin\Documents\Projects\JSIL\jsil.org\demos\GameType\GameType.jsilconfig" --platform:x86 --configuration:Debug -JSILc "C:\Users\Kevin\Documents\Projects\Soulcaster\SoulcasterHTML5.sln" "C:\Users\Kevin\Documents\Projects\Soulcaster\Soulcaster2\Soulcaster2\bin\x86\DebugPC\TarchonData.XmlSerializers.dll" "C:\Users\Kevin\Documents\Projects\JSIL\jsil.org\demos\Soulcaster\Soulcaster.jsilconfig" --platform:x86 --configuration:DebugPC JSILc "C:\Users\Kevin\Documents\Projects\XNAVERGE\Sully.sln" "C:\Users\Kevin\Documents\Projects\JSIL\jsil.org\demos\Sully\Sully.jsilconfig" --platform:x86 --configuration:Debug JSILc "C:\Users\Kevin\Documents\Projects\lumberjack\LumberjackPC.sln" "C:\Users\Kevin\Documents\Projects\lumberjack\Lumberjack\Lumberjack\bin\x86\Debug\Lumberjack.XmlSerializers.dll" "C:\Users\Kevin\Documents\Projects\JSIL\jsil.org\demos\Lumberjack\Lumberjack.jsilconfig" --platform:x86 --configuration:Debug JSILc "C:\Users\Kevin\Documents\Projects\JSIL\Examples\SimpleRaytracer.sln" diff --git a/jsil.org/demos/Soulcaster/Soulcaster.css b/jsil.org/demos/Soulcaster/Soulcaster.css index 368da3aa4..f59f15872 100644 --- a/jsil.org/demos/Soulcaster/Soulcaster.css +++ b/jsil.org/demos/Soulcaster/Soulcaster.css @@ -15,22 +15,6 @@ a, a:visited { left: 0px; top: 0px; cursor: none; - - /* - - -moz-transform: scale(2); - -webkit-transform: scale(2); - -o-transform: scale(2); - -ms-transform: scale(2); - transform: scale(2); - - -moz-transform-origin: top left; - -webkit-transform-origin: top left; - -o-transform-origin: top left; - -ms-transform-origin: top left; - transform-origin: top left; - - */ } #welcomeMessage { width: 620px; @@ -60,20 +44,20 @@ a, a:visited { height: 40px; } #log { - width: 704px; + width: 640px; height: 200px; left: 2px; - top: 544px; + top: 484px; overflow-x: hidden; overflow-y: scroll; } #fullscreenButton { - left: 708px; + left: 644px; top: 2px; height: 45px; } #stats { - left: 708px; + left: 644px; top: 50px; } .boxCaption { diff --git a/jsil.org/demos/Soulcaster/Soulcaster.html b/jsil.org/demos/Soulcaster/Soulcaster.html index 6eda9fcf4..7071b62f1 100644 --- a/jsil.org/demos/Soulcaster/Soulcaster.html +++ b/jsil.org/demos/Soulcaster/Soulcaster.html @@ -1,7 +1,7 @@
-