will/pamela
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:sandb/pamela

Browse Source 
Conflicts:
	macs.php
This commit is contained in:
sandb 2010-03-21 23:20:47 +01:00
commit 1a9cca6d0c
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/whitespace-logo-square-transp-drop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

10
index.html
View File

@ -1,11 +1,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Pamela</title>
<script src="js/jquery-1.3.2.js" type="text/javascript" />
<script src="js/pamela-buttons.js" type="text/javascript" />
<script src="js/pamela-nodes.js" type="text/javascript" />
<script src="js/pamela-matrices.js" type="text/javascript" />
<script src="js/pamela.js" type="text/javascript" />
<script src="js/jquery-1.3.2.js" type="text/javascript"></script>
<script src="js/pamela-buttons.js" type="text/javascript"></script>
<script src="js/pamela-nodes.js" type="text/javascript"></script>
<script src="js/pamela-matrices.js" type="text/javascript"></script>
<script src="js/pamela.js" type="text/javascript"></script>
<style type="text/css">* {margin:0; padding:0} body { background-color: #fff; }</style>
</head>
<body>

6
js/pamela-nodes.js
View File

@ -175,7 +175,7 @@ Node.prototype.draw = Node.prototype.normal.draw;
jQuery.extend(NorbertNode.prototype, Node.prototype);
function NorbertNode() {
this.norbert = new Image();
this.norbert.src = "img/norbert-8bit.png";
this.norbert.src = "img/whitespace-logo-square-transp-drop.png";
self = this;
this.norbertLoaded = false;
this.norbert.onload=function() { self.norbertLoaded = true; }
@ -185,8 +185,8 @@ function NorbertNode() {
NorbertNode.prototype.draw = function() {
var s = Math.abs(this.projection.z / (width / 2));
s *= 2;
var x = Math.floor(this.projection.x - (186 / s));
var y = Math.floor(this.projection.y - (50 / s));
var x = Math.floor(this.projection.x - (280 / s));
var y = Math.floor(this.projection.y - (240 / s));
//var x = Math.floor(this.projection.x - (192 / s));
//var y = Math.floor(this.projection.y - (180 / s));
if (this.norbertLoaded)

14
macs.php
View File

@ -27,15 +27,11 @@ require_once("config.php");
require_once("lib/trans.php");
require_once("lib/macs.php");
//function translator($mac) {
// global $mac_translation_table;
// if (array_key_exists($mac, $mac_translation_table))
// return $mac_translation_table[$mac];
// return $mac;
//}
$macs = macs_get();
$macs = known_macs_translate($macs);
//$macs = array_map("translator", $macs);
echo '["'.implode('", "', $macs).'"]';
if (count($macs) > 0) {
echo '["'.implode('", "', $macs).'"]';
} else {
echo '[]';
}
macs_purge();