| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2010, Google Inc. | 2  * Copyright 2010, Google Inc. | 
| 3  * All rights reserved. | 3  * All rights reserved. | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions are | 6  * modification, are permitted provided that the following conditions are | 
| 7  * met: | 7  * met: | 
| 8  * | 8  * | 
| 9  *     * Redistributions of source code must retain the above copyright | 9  *     * Redistributions of source code must retain the above copyright | 
| 10  * notice, this list of conditions and the following disclaimer. | 10  * notice, this list of conditions and the following disclaimer. | 
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 67 o3d.Bitmap.FACE_NEGATIVE_X = 1; | 67 o3d.Bitmap.FACE_NEGATIVE_X = 1; | 
| 68 o3d.Bitmap.FACE_POSITIVE_Y = 2; | 68 o3d.Bitmap.FACE_POSITIVE_Y = 2; | 
| 69 o3d.Bitmap.FACE_NEGATIVE_Y = 3; | 69 o3d.Bitmap.FACE_NEGATIVE_Y = 3; | 
| 70 o3d.Bitmap.FACE_POSITIVE_Z = 4; | 70 o3d.Bitmap.FACE_POSITIVE_Z = 4; | 
| 71 o3d.Bitmap.FACE_NEGATIVE_Z = 5; | 71 o3d.Bitmap.FACE_NEGATIVE_Z = 5; | 
| 72 o3d.Bitmap.IMAGE = 6; | 72 o3d.Bitmap.IMAGE = 6; | 
| 73 o3d.Bitmap.SLICE = 7; | 73 o3d.Bitmap.SLICE = 7; | 
| 74 | 74 | 
| 75 | 75 | 
| 76 /** | 76 /** | 
|  | 77  * The scratch canvas object. | 
|  | 78  * @private | 
|  | 79  */ | 
|  | 80 o3d.Bitmap.scratch_canvas_ = null; | 
|  | 81 | 
|  | 82 | 
|  | 83 /** | 
|  | 84  * Gets a canvas to use for scratch work. | 
|  | 85  * @private | 
|  | 86  */ | 
|  | 87 o3d.Bitmap.getScratchCanvas_ = function() { | 
|  | 88   if (!o3d.Bitmap.scratch_canvas_) | 
|  | 89     o3d.Bitmap.scratch_canvas_ = document.createElement('CANVAS'); | 
|  | 90   return o3d.Bitmap.scratch_canvas_; | 
|  | 91 } | 
|  | 92 | 
|  | 93 | 
|  | 94 /** | 
| 77  * In webgl the bitmap object is represented by an offscreen canvas. | 95  * In webgl the bitmap object is represented by an offscreen canvas. | 
| 78  * @type {Canvas} | 96  * @type {Canvas} | 
| 79  * @private | 97  * @private | 
| 80  */ | 98  */ | 
| 81 o3d.Bitmap.prototype.canvas_ = null; | 99 o3d.Bitmap.prototype.canvas_ = null; | 
| 82 | 100 | 
| 83 | 101 | 
| 84 /** | 102 /** | 
| 85  * Flips a bitmap vertically in place. | 103  * Flips a bitmap vertically in place. | 
| 86  */ | 104  */ | 
| 87 o3d.Bitmap.prototype.flipVertically = function() { | 105 o3d.Bitmap.prototype.flipVertically = function() { | 
| 88   this.defer_flip_vertically_to_texture_ = true; | 106   this.defer_flip_vertically_to_texture_ = true; | 
| 89 }; | 107 }; | 
| 90 | 108 | 
| 91 | 109 | 
|  | 110 | 
| 92 /** | 111 /** | 
| 93  * Generates mip maps from the source level to lower levels. | 112  * Generates mip maps from the source level to lower levels. | 
| 94  * | 113  * | 
| 95  * You can not currently generate mips for DXT textures although you can load | 114  * You can not currently generate mips for DXT textures although you can load | 
| 96  * them from dds files. | 115  * them from dds files. | 
| 97  * | 116  * | 
| 98  * @param {number} source_level The level to use as the source of the mips. | 117  * @param {number} source_level The level to use as the source of the mips. | 
| 99  * @param {number} num_levels The number of levels to generate below the | 118  * @param {number} num_levels The number of levels to generate below the | 
| 100  *     source level. | 119  *     source level. | 
| 101  */ | 120  */ | 
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 155 | 174 | 
| 156 | 175 | 
| 157 /** | 176 /** | 
| 158  * The Semantic of the bitmap. | 177  * The Semantic of the bitmap. | 
| 159  * @type {!o3d.Bitmap.Semantic} | 178  * @type {!o3d.Bitmap.Semantic} | 
| 160  */ | 179  */ | 
| 161 o3d.Bitmap.prototype.semantic = o3d.Bitmap.UNKNOWN_SEMANTIC; | 180 o3d.Bitmap.prototype.semantic = o3d.Bitmap.UNKNOWN_SEMANTIC; | 
| 162 | 181 | 
| 163 | 182 | 
| 164 | 183 | 
| OLD | NEW | 
|---|