Skip to content

Commit

Permalink
ghoulsblade#17 Clouds example does not work, but does not produce err…
Browse files Browse the repository at this point in the history 
…ors.
  • Loading branch information
@campadrenalin
campadrenalin committed Apr 14, 2013
1 parent 088cd3b commit 832893f
Show file tree
Hide file tree
Showing 8 changed files with 477 additions and 592 deletions.
43 changes: 22 additions & 21 deletions clouds/index.html
View file
Expand Up @@ -6,33 +6,34 @@

<link rel="stylesheet" href="../style.css" type="text/css">

<script type="text/javascript" src="../js/lua-parser.js" ></script>
<script type="text/javascript" src="../js/lua-parser-utils.js" ></script>
<script type="text/javascript" src="../js/weblua/build/liblua.js" ></script>
<script type="text/javascript" src="../js/gamepad.js" ></script>
<script type="text/javascript" src="../js/jquery.js" ></script>
<script type="text/javascript" src="../js/jquery.hotkeys.js" ></script>
<script type="text/javascript" src="../js/utils.js" ></script>
<script type="text/javascript" src="../js/utils.webgl.js" ></script>
<script type="text/javascript" src="../js/love.render.js" ></script>
<script type="text/javascript" src="../js/utils.js" ></script>
<script type="text/javascript" src="../js/utils.webgl.js" ></script>
<script type="text/javascript" src="../js/love.render.js" ></script>
<script type="text/javascript" src="../js/main.js" ></script>

<script type="text/javascript" src="../js/love.audio.js" ></script>
<script type="text/javascript" src="../js/love.event.js" ></script>
<script type="text/javascript" src="../js/love.filesystem.js" ></script>
<script type="text/javascript" src="../js/love.font.js" ></script>
<script type="text/javascript" src="../js/love.graphics.js" ></script>
<script type="text/javascript" src="../js/love.image.js" ></script>
<script type="text/javascript" src="../js/love.joystick.js" ></script>
<script type="text/javascript" src="../js/love.keyboard.js" ></script>
<script type="text/javascript" src="../js/love.mouse.js" ></script>
<script type="text/javascript" src="../js/Box2dWeb-2.1.a.3.min.js" ></script>
<script type="text/javascript" src="../js/love.physics.js" ></script>
<script type="text/javascript" src="../js/love.sound.js" ></script>
<script type="text/javascript" src="../js/love.thread.js" ></script>
<script type="text/javascript" src="../js/love.timer.js" ></script>
<script type="text/javascript" src="../js/love.audio.js" ></script>
<script type="text/javascript" src="../js/love.event.js" ></script>
<script type="text/javascript" src="../js/love.filesystem.js" ></script>
<script type="text/javascript" src="../js/love.font.js" ></script>
<script type="text/javascript" src="../js/love.graphics.js" ></script>
<script type="text/javascript" src="../js/love.image.js" ></script>
<script type="text/javascript" src="../js/love.joystick.js" ></script>
<script type="text/javascript" src="../js/love.keyboard.js" ></script>
<script type="text/javascript" src="../js/love.mouse.js" ></script>
<script type="text/javascript" src="../js/Box2dWeb-2.1.a.3.min.js" ></script>
<script type="text/javascript" src="../js/love.physics.js" ></script>
<script type="text/javascript" src="../js/love.sound.js" ></script>
<script type="text/javascript" src="../js/love.thread.js" ></script>
<script type="text/javascript" src="../js/love.timer.js" ></script>

<script type="text/javascript">gShaderCode_Fragment = LoadShaderCode("../js/fragment.shader");</script>
<script type="text/javascript">gShaderCode_Vertex = LoadShaderCode("../js/vertex.shader");</script>
<script type="text/javascript">
gShaderCode_Fragment = LoadShaderCode("../js/fragment.shader");
gShaderCode_Vertex = LoadShaderCode("../js/vertex.shader");
</script>

</head>
<body onload="MainOnLoad(['body.png','cloud_plain.png','ear.png','face.png','love.png'])">
Expand Down
84 changes: 42 additions & 42 deletions js/love.audio.js
View file
Expand Up @@ -8,63 +8,63 @@
function Love_Audio_Init () {}

function Love_Audio_CreateTable (G) {
var t = lua_newtable();
var t = {};
var pre = "love.audio.";

G.str['love'].str['audio'] = t;
G['love']['audio'] = t;

// love.audio.newSource(path)
t.str['newSource'] = function (path,srctype) { return [Love_Audio_MakeSourceHandle(new cLoveAudioSource(path,srctype))]; }
//~ t.str['newSource'] = function () { return NotImplemented(pre+'newSource'); }
t['newSource'] = function (path,srctype) { return [Love_Audio_MakeSourceHandle(new cLoveAudioSource(path,srctype))]; }
//~ t['newSource'] = function () { return NotImplemented(pre+'newSource'); }

// love.audio.play(sourceobj, number)
t.str['play'] = function (src,num) { if (src && src._data) src._data.love_audio_play(); } // MainPrint("audio.play called");
//~ t.str['play'] = function () { return NotImplemented(pre+'play'); }
t['play'] = function (src,num) { if (src && src._data) src._data.love_audio_play(); } // MainPrint("audio.play called");
//~ t['play'] = function () { return NotImplemented(pre+'play'); }

// TODO: "play" overloads
// TODO: "newSource" overloads

t.str['getNumSources'] = function () { return NotImplemented(pre+'getNumSources'); }
t.str['getOrientation'] = function () { return NotImplemented(pre+'getOrientation'); }
t.str['getPosition'] = function () { return NotImplemented(pre+'getPosition'); }
t.str['getVelocity'] = function () { return NotImplemented(pre+'getVelocity'); }
t.str['getVolume'] = function () { return NotImplemented(pre+'getVolume'); }
t.str['pause'] = function () { return NotImplemented(pre+'pause'); }
t.str['resume'] = function () { return NotImplemented(pre+'resume'); }
t.str['rewind'] = function () { return NotImplemented(pre+'rewind'); }
t.str['setOrientation'] = function () { return NotImplemented(pre+'setOrientation'); }
t.str['setPosition'] = function () { return NotImplemented(pre+'setPosition'); }
t.str['setVelocity'] = function () { return NotImplemented(pre+'setVelocity'); }
t.str['setVolume'] = function () { return NotImplemented(pre+'setVolume'); }
t.str['stop'] = function () { return NotImplemented(pre+'stop'); }
t['getNumSources'] = function () { return NotImplemented(pre+'getNumSources'); }
t['getOrientation'] = function () { return NotImplemented(pre+'getOrientation'); }
t['getPosition'] = function () { return NotImplemented(pre+'getPosition'); }
t['getVelocity'] = function () { return NotImplemented(pre+'getVelocity'); }
t['getVolume'] = function () { return NotImplemented(pre+'getVolume'); }
t['pause'] = function () { return NotImplemented(pre+'pause'); }
t['resume'] = function () { return NotImplemented(pre+'resume'); }
t['rewind'] = function () { return NotImplemented(pre+'rewind'); }
t['setOrientation'] = function () { return NotImplemented(pre+'setOrientation'); }
t['setPosition'] = function () { return NotImplemented(pre+'setPosition'); }
t['setVelocity'] = function () { return NotImplemented(pre+'setVelocity'); }
t['setVolume'] = function () { return NotImplemented(pre+'setVolume'); }
t['stop'] = function () { return NotImplemented(pre+'stop'); }
}

function Love_Audio_MakeSourceHandle (o) {
var t = lua_newtable();
var t = {};
var pre = "love.audio.source.";
t._data = o;
t.str['type'] = function (t ) { return t._data.type (); }
t.str['typeOf'] = function (t ) { return t._data.typeOf (); }
t.str['getDirection'] = function (t ) { return t._data.getDirection (); }
t.str['getPitch'] = function (t ) { return t._data.getPitch (); }
t.str['getPosition'] = function (t ) { return t._data.getPosition (); }
t.str['getVelocity'] = function (t ) { return t._data.getVelocity (); }
t.str['getVolume'] = function (t ) { return t._data.getVolume (); }
t.str['isLooping'] = function (t ) { return t._data.isLooping (); }
t.str['isPaused'] = function (t ) { return t._data.isPaused (); }
t.str['isStatic'] = function (t ) { return t._data.isStatic (); }
t.str['isStopped'] = function (t ) { return t._data.isStopped (); }
t.str['pause'] = function (t ) { return t._data.pause (); }
t.str['play'] = function (t ) { return t._data.play (); }
t.str['resume'] = function (t ) { return t._data.resume (); }
t.str['rewind'] = function (t ) { return t._data.rewind (); }
t.str['setDirection'] = function (t ) { return t._data.setDirection (); }
t.str['setLooping'] = function (t,bLoop ) { return t._data.setLooping (bLoop); }
t.str['setPitch'] = function (t ) { return t._data.setPitch (); }
t.str['setPosition'] = function (t ) { return t._data.setPosition (); }
t.str['setVelocity'] = function (t ) { return t._data.setVelocity (); }
t.str['setVolume'] = function (t,vol ) { return t._data.setVolume (vol); }
t.str['stop'] = function (t ) { return t._data.stop (); }
t['type'] = function (t ) { return t._data.type (); }
t['typeOf'] = function (t ) { return t._data.typeOf (); }
t['getDirection'] = function (t ) { return t._data.getDirection (); }
t['getPitch'] = function (t ) { return t._data.getPitch (); }
t['getPosition'] = function (t ) { return t._data.getPosition (); }
t['getVelocity'] = function (t ) { return t._data.getVelocity (); }
t['getVolume'] = function (t ) { return t._data.getVolume (); }
t['isLooping'] = function (t ) { return t._data.isLooping (); }
t['isPaused'] = function (t ) { return t._data.isPaused (); }
t['isStatic'] = function (t ) { return t._data.isStatic (); }
t['isStopped'] = function (t ) { return t._data.isStopped (); }
t['pause'] = function (t ) { return t._data.pause (); }
t['play'] = function (t ) { return t._data.play (); }
t['resume'] = function (t ) { return t._data.resume (); }
t['rewind'] = function (t ) { return t._data.rewind (); }
t['setDirection'] = function (t ) { return t._data.setDirection (); }
t['setLooping'] = function (t,bLoop ) { return t._data.setLooping (bLoop); }
t['setPitch'] = function (t ) { return t._data.setPitch (); }
t['setPosition'] = function (t ) { return t._data.setPosition (); }
t['setVelocity'] = function (t ) { return t._data.setVelocity (); }
t['setVolume'] = function (t,vol ) { return t._data.setVolume (vol); }
t['stop'] = function (t ) { return t._data.stop (); }

return t;
}
Expand Down
16 changes: 8 additions & 8 deletions js/love.event.js
View file
Expand Up @@ -22,14 +22,14 @@ window.onbeforeunload = function() {

/// init lua api
function Love_Event_CreateTable (G) {
var t = lua_newtable();
var t = {};
var pre = "love.event.";

G.str['love'].str['event'] = t;
t.str['clear'] = function () { gEvents = []; }
t.str['poll'] = function () { return [Love_Event_PollIterator]; }
t.str['pump'] = function () { } // If you ever need other events coming in
t.str['push'] = function (e, a, b, c, d) { gEvents[gEvents.length] = [e, a, b, c, d]; }
t.str['wait'] = function () { } // Makes no sense, there is nothing else that can push stuff.. yet
t['clear'] = function () { gEvents = []; return LuaNil; }
t['poll'] = function () { return [Love_Event_PollIterator]; }
t['pump'] = function () { return LuaNil; } // If you ever need other events coming in
t['push'] = function (e, a, b, c, d) { gEvents[gEvents.length] = [e, a, b, c, d]; return LuaNil; }
t['wait'] = function () { return LuaNil; } // Makes no sense, there is nothing else that can push stuff.. yet

Lua.inject(t, null, "love.event");
}
61 changes: 32 additions & 29 deletions js/love.filesystem.js
View file
Expand Up @@ -44,7 +44,7 @@ function LoveFileList (url) {
// example: "dira" contains 1 file (a.txt) and 2 subdirs (diraa,dirab) : love.filesystem.enumerate("dira") (="dira/") = {"a.txt","diraa","dirab"}
function LoveFilesystemEnumerate (path) {
if (!gFilesystemEnumerateList) return NotImplemented(pre+'enumerate (try index.html body onload : LoveFileList("filelist.txt") from "find . > filelist.txt")');
var res = lua_newtable();
var res = {};
if (path.substring(path.length - 1) == "/") path = path.substring(0,path.length - 1); // remove trailing /
path = LoveFSNormalizePath(path);
// TODO : evaluate ./ and ../ , js-regex ?
Expand Down Expand Up @@ -92,52 +92,53 @@ function LoveFS_exists (path) {
}

/// init lua api
function Love_Filesystem_CreateTable (G) {
var t = lua_newtable();
function Love_Filesystem_CreateTable () {
var t = {};
var pre = "love.filesystem.";

G.str['love'].str['filesystem'] = t;
t['enumerate'] = function (path) { return LoveFilesystemEnumerate(path); }

t.str['enumerate'] = function (path) { return LoveFilesystemEnumerate(path); }
t['exists'] = function (path) { return [LoveFS_exists(path)]; }
t['isDirectory'] = function (path) { return [LoveFS_isDir(path)]; }
t['isFile'] = function (path) { return [LoveFS_isFile(path)]; }

t.str['exists'] = function (path) { return [LoveFS_exists(path)]; }
t.str['isDirectory'] = function (path) { return [LoveFS_isDir(path)]; }
t.str['isFile'] = function (path) { return [LoveFS_isFile(path)]; }

t.str['getLastModified'] = function () { return NotImplemented(pre+'getLastModified'); }
t.str['getAppdataDirectory'] = function () { NotImplemented(pre+'getAppdataDirectory'); return [""]; }
t.str['getSaveDirectory'] = function () { NotImplemented(pre+'getSaveDirectory'); return [""]; }
t.str['getUserDirectory'] = function () { NotImplemented(pre+'getUserDirectory'); return [""]; }
t.str['getWorkingDirectory'] = function () { NotImplemented(pre+'getWorkingDirectory'); return [""]; }
t.str['init'] = function () { }
t.str['lines'] = function () { return NotImplemented(pre+'lines'); }
t.str['load'] = function (path) { return [function () { return RunLuaFromPath(path); }]; } // quick&dirty
t.str['mkdir'] = function () { return NotImplemented(pre+'mkdir'); }
t.str['newFile'] = function () { return NotImplemented(pre+'newFile'); }
t.str['newFileData'] = function () { return NotImplemented(pre+'newFileData'); }
t.str['read'] = function (path) { return [LoveFS_readFile(path)]; }
t.str['remove'] = function () { return NotImplemented(pre+'remove (no LocalStorage)'); }
t.str['setIdentity'] = function () { return NotImplemented(pre+'setIdentity (no LocalStorage)'); }
t.str['setSource'] = function () { return NotImplemented(pre+'setSource'); }
t.str['write'] = function (filename, data) { return NotImplemented(pre+"write (no LocalStorage)"); }
t['getLastModified'] = function () { return NotImplemented(pre+'getLastModified'); }
t['getAppdataDirectory'] = function () { NotImplemented(pre+'getAppdataDirectory'); return [""]; }
t['getSaveDirectory'] = function () { NotImplemented(pre+'getSaveDirectory'); return [""]; }
t['getUserDirectory'] = function () { NotImplemented(pre+'getUserDirectory'); return [""]; }
t['getWorkingDirectory'] = function () { NotImplemented(pre+'getWorkingDirectory'); return [""]; }
t['init'] = function () { }
t['lines'] = function () { return NotImplemented(pre+'lines'); }
t['load'] = function (path) { return [function () { return RunLuaFromPath(path); }]; } // quick&dirty
t['mkdir'] = function () { return NotImplemented(pre+'mkdir'); }
t['newFile'] = function () { return NotImplemented(pre+'newFile'); }
t['newFileData'] = function () { return NotImplemented(pre+'newFileData'); }
t['read'] = function (path) { return [LoveFS_readFile(path)]; }
t['remove'] = function () { return NotImplemented(pre+'remove (no LocalStorage)'); }
t['setIdentity'] = function () { return NotImplemented(pre+'setIdentity (no LocalStorage)'); }
t['setSource'] = function () { return NotImplemented(pre+'setSource'); }
t['write'] = function (filename, data) { return NotImplemented(pre+"write (no LocalStorage)"); }


if (localStorage)
{
t.str['write'] = function (path, data)
t['write'] = function (path, data)
{
localStorage[gFilesystemPrefix+path] = data;
return LuaNil;
}
t.str['setIdentity'] = function (identity)
t['setIdentity'] = function (identity)
{
if (identity)
gFilesystemPrefix = identity + "-";
return LuaNil;
}
t.str['remove'] = function (path)
t['remove'] = function (path)
{
localStorage.removeItem(gFilesystemPrefix+path);
return LuaNil;
}
t.str['load'] = function (path)
t['load'] = function (path)
{
var file = localStorage[gFilesystemPrefix+path];
if (file)
Expand All @@ -154,4 +155,6 @@ function Love_Filesystem_CreateTable (G) {
return [function () { return RunLuaFromPath(path); }]; // quick&dirty
}
}

Lua.inject(t, null, 'love.filesystem');
}

0 comments on commit 832893f

Please sign in to comment.