ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use named exports from ol/index.js

Browse Source
This commit is contained in:
Tim Schaub
2017-12-12 10:24:58 -07:00
parent fce644556b
commit 87295a74dd
250 changed files with 874 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/webgl/Context.js
View File

@@ -1,7 +1,7 @@
/**
* @module ol/webgl/Context
*/
import _ol_ from '../index.js';
import {WEBGL_EXTENSIONS, getUid, inherits} from '../index.js';
import _ol_Disposable_ from '../Disposable.js';
import _ol_array_ from '../array.js';
import _ol_events_ from '../events.js';
@@ -78,7 +78,7 @@ var _ol_webgl_Context_ = function(canvas, gl) {
* @type {boolean}
*/
this.hasOESElementIndexUint = _ol_array_.includes(
_ol_.WEBGL_EXTENSIONS, 'OES_element_index_uint');
WEBGL_EXTENSIONS, 'OES_element_index_uint');
// use the OES_element_index_uint extension if available
if (this.hasOESElementIndexUint) {
@@ -92,7 +92,7 @@ var _ol_webgl_Context_ = function(canvas, gl) {
};
_ol_.inherits(_ol_webgl_Context_, _ol_Disposable_);
inherits(_ol_webgl_Context_, _ol_Disposable_);
/**
@@ -105,7 +105,7 @@ _ol_.inherits(_ol_webgl_Context_, _ol_Disposable_);
_ol_webgl_Context_.prototype.bindBuffer = function(target, buf) {
var gl = this.getGL();
var arr = buf.getArray();
var bufferKey = String(_ol_.getUid(buf));
var bufferKey = String(getUid(buf));
if (bufferKey in this.bufferCache_) {
var bufferCacheEntry = this.bufferCache_[bufferKey];
gl.bindBuffer(target, bufferCacheEntry.buffer);
@@ -133,7 +133,7 @@ _ol_webgl_Context_.prototype.bindBuffer = function(target, buf) {
*/
_ol_webgl_Context_.prototype.deleteBuffer = function(buf) {
var gl = this.getGL();
var bufferKey = String(_ol_.getUid(buf));
var bufferKey = String(getUid(buf));
var bufferCacheEntry = this.bufferCache_[bufferKey];
if (!gl.isContextLost()) {
gl.deleteBuffer(bufferCacheEntry.buffer);
@@ -204,7 +204,7 @@ _ol_webgl_Context_.prototype.getHitDetectionFramebuffer = function() {
* @return {WebGLShader} Shader.
*/
_ol_webgl_Context_.prototype.getShader = function(shaderObject) {
var shaderKey = String(_ol_.getUid(shaderObject));
var shaderKey = String(getUid(shaderObject));
if (shaderKey in this.shaderCache_) {
return this.shaderCache_[shaderKey];
} else {
@@ -229,7 +229,7 @@ _ol_webgl_Context_.prototype.getShader = function(shaderObject) {
_ol_webgl_Context_.prototype.getProgram = function(
fragmentShaderObject, vertexShaderObject) {
var programKey =
_ol_.getUid(fragmentShaderObject) + '/' + _ol_.getUid(vertexShaderObject);
getUid(fragmentShaderObject) + '/' + getUid(vertexShaderObject);
if (programKey in this.programCache_) {
return this.programCache_[programKey];
} else {

4
src/ol/webgl/Fragment.js
View File

@@ -1,7 +1,7 @@
/**
* @module ol/webgl/Fragment
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_webgl_ from '../webgl.js';
import _ol_webgl_Shader_ from '../webgl/Shader.js';
@@ -15,7 +15,7 @@ var _ol_webgl_Fragment_ = function(source) {
_ol_webgl_Shader_.call(this, source);
};
_ol_.inherits(_ol_webgl_Fragment_, _ol_webgl_Shader_);
inherits(_ol_webgl_Fragment_, _ol_webgl_Shader_);
/**

4
src/ol/webgl/Vertex.js
View File

@@ -1,7 +1,7 @@
/**
* @module ol/webgl/Vertex
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_webgl_ from '../webgl.js';
import _ol_webgl_Shader_ from '../webgl/Shader.js';
@@ -15,7 +15,7 @@ var _ol_webgl_Vertex_ = function(source) {
_ol_webgl_Shader_.call(this, source);
};
_ol_.inherits(_ol_webgl_Vertex_, _ol_webgl_Shader_);
inherits(_ol_webgl_Vertex_, _ol_webgl_Shader_);
/**

6
src/ol/webgl/shader.mustache
View File

@@ -1,16 +1,16 @@
// This file is automatically generated, do not edit.
// Run `make shaders` to generate, and commit the result.
import _ol_ from '../../index.js';
import {DEBUG_WEBGL} from '../../index.js';
import _ol_webgl_Fragment_ from '../../webgl/Fragment.js';
import _ol_webgl_Vertex_ from '../../webgl/Vertex.js';
var {{namespace}} = {};
{{namespace}}.fragment = new _ol_webgl_Fragment_(_ol_.DEBUG_WEBGL ?
{{namespace}}.fragment = new _ol_webgl_Fragment_(DEBUG_WEBGL ?
'precision mediump float;\n{{{originalFragmentSource}}}' :
'precision mediump float;{{{fragmentSource}}}');
{{namespace}}.vertex = new _ol_webgl_Vertex_(_ol_.DEBUG_WEBGL ?
{{namespace}}.vertex = new _ol_webgl_Vertex_(DEBUG_WEBGL ?
'{{{originalVertexSource}}}' :
'{{{vertexSource}}}');

6
src/ol/webgl/shaderlocations.mustache
View File

@@ -1,7 +1,7 @@
// This file is automatically generated, do not edit
// Run `make shaders` to generate, and commit the result.
import _ol_ from '../../../index.js';
import {DEBUG_WEBGL} from '../../../index.js';
/**
* @constructor
@@ -16,7 +16,7 @@ import _ol_ from '../../../index.js';
* @type {WebGLUniformLocation}
*/
this.{{originalName}} = gl.getUniformLocation(
program, _ol_.DEBUG_WEBGL ? '{{originalName}}' : '{{shortName}}');
program, DEBUG_WEBGL ? '{{originalName}}' : '{{shortName}}');
{{/uniforms}}
{{#attributes}}
@@ -24,7 +24,7 @@ import _ol_ from '../../../index.js';
* @type {number}
*/
this.{{originalName}} = gl.getAttribLocation(
program, _ol_.DEBUG_WEBGL ? '{{originalName}}' : '{{shortName}}');
program, DEBUG_WEBGL ? '{{originalName}}' : '{{shortName}}');
{{/attributes}}
};