diff options
author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/helper-classes/backup-delete/GLLight.js | |
parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/helper-classes/backup-delete/GLLight.js')
-rwxr-xr-x | js/helper-classes/backup-delete/GLLight.js | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/js/helper-classes/backup-delete/GLLight.js b/js/helper-classes/backup-delete/GLLight.js deleted file mode 100755 index 2bd5f77e..00000000 --- a/js/helper-classes/backup-delete/GLLight.js +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | /////////////////////////////////////////////////////////////////////// | ||
8 | // Class GLMaterial | ||
9 | // GL representation of a material. | ||
10 | /////////////////////////////////////////////////////////////////////// | ||
11 | function GLLight() | ||
12 | { | ||
13 | /////////////////////////////////////////////////////////////////////// | ||
14 | // Instance variables | ||
15 | /////////////////////////////////////////////////////////////////////// | ||
16 | this._type = 0; | ||
17 | this._color = [0.1, 0.1, 0.1, 1]; | ||
18 | |||
19 | /////////////////////////////////////////////////////////////////////// | ||
20 | // Property Accessors | ||
21 | /////////////////////////////////////////////////////////////////////// | ||
22 | |||
23 | |||
24 | /////////////////////////////////////////////////////////////////////// | ||
25 | // Methods | ||
26 | /////////////////////////////////////////////////////////////////////// | ||
27 | |||
28 | } | ||
29 | |||
30 | |||