Fix provide/require structure for autogenerated shader files

geosense · Aug 29, 2017 · cf8c72c · cf8c72c
1 parent 5cfb1e4
commit cf8c72c
Show file tree

Hide file tree

Showing 28 changed files with 482 additions and 909 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ cache:
   - node_modules
 before_script:
 - rm src/ol/renderer/webgl/*shader.js
+- rm src/ol/renderer/webgl/*shader/locations.js
 script: make ci
 after_success:
 - cat coverage/lcov.info | coveralls

diff --git a/Makefile b/Makefile
@@ -3,7 +3,8 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 
 SRC_GLSL := $(shell find src -type f -name '*.glsl')
 SRC_SHADER_JS := $(patsubst %shader.glsl,%shader.js,$(SRC_GLSL))
-SRC_JS := $(filter-out $(SRC_SHADER_JS),$(shell find src -name '*.js'))
+SRC_SHADERLOCATIONS_JS := $(patsubst %shader.glsl,%shader/locations.js,$(SRC_GLSL))
+SRC_JS := $(filter-out $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS),$(shell find src -name '*.js'))
 SRC_JSDOC = $(shell find src -type f -name '*.jsdoc')
 
 EXAMPLES := $(shell find examples -type f)
@@ -116,7 +117,7 @@ install: build/timestamps/node-modules-timestamp
 npm-install: build/timestamps/node-modules-timestamp
 
 .PHONY: shaders
-shaders: $(SRC_SHADER_JS)
+shaders: $(SRC_SHADER_JS $(SRC_SHADERLOCATIONS_JS)
 
 .PHONY: serve
 serve:
@@ -167,7 +168,7 @@ build/compiled-examples/all.js: $(EXAMPLES_JS)
 	@python bin/combine-examples.py $^ > $@
 
 build/compiled-examples/all.combined.js: config/examples-all.json build/compiled-examples/all.js \
-                                         $(SRC_JS) $(SRC_SHADER_JS) \
+                                         $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
                                          build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
@@ -178,14 +179,14 @@ build/compiled-examples/%.json: config/example.json build/examples/%.js \
 	@sed -e 's|{{id}}|$*|' $< > $@
 
 build/compiled-examples/%.combined.js: build/compiled-examples/%.json \
-                                       $(SRC_JS) $(SRC_SHADER_JS) \
+                                       $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS)\
                                        build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
 
 build/timestamps/jsdoc-$(BRANCH)-timestamp: config/jsdoc/api/index.md \
                                             config/jsdoc/api/conf.json $(SRC_JS) \
-                                            $(SRC_SHADER_JS) \
+                                            $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
                                             $(shell find config/jsdoc/api/template -type f) \
                                             build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
@@ -236,7 +237,7 @@ build/ol.css: css/ol.css build/timestamps/node-modules-timestamp
 	@echo "Running cleancss..."
 	@./node_modules/.bin/cleancss $< > $@
 
-build/ol.js: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) \
+build/ol.js: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
              build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
@@ -246,12 +247,12 @@ build/ol.js: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) \
 	@$(STAT_COMPRESSED) /tmp/ol.js.gz
 	@rm /tmp/ol.js.gz
 
-build/ol.js.map: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) \
+build/ol.js.map: config/ol.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
                  build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
 
-build/ol-debug.js: config/ol-debug.json $(SRC_JS) $(SRC_SHADER_JS) \
+build/ol-debug.js: config/ol-debug.json $(SRC_JS) $(SRC_SHADER_JS) $(SRC_SHADERLOCATIONS_JS) \
                    build/timestamps/node-modules-timestamp
 	@mkdir -p $(@D)
 	node tasks/build.js $< $@
@@ -264,6 +265,10 @@ build/ol-debug.js: config/ol-debug.json $(SRC_JS) $(SRC_SHADER_JS) \
 %shader.js: %shader.glsl src/ol/webgl/shader.mustache bin/pyglslunit.py build/timestamps/node-modules-timestamp
 	@python bin/pyglslunit.py --input $< | ./node_modules/.bin/mustache - src/ol/webgl/shader.mustache > $@
 
+%shader/locations.js: %shader.glsl src/ol/webgl/shaderlocations.mustache bin/pyglslunit.py build/timestamps/node-modules-timestamp
+	@mkdir -p $(@D)
+	@python bin/pyglslunit.py --input $< | ./node_modules/.bin/mustache - src/ol/webgl/shaderlocations.mustache > $@
+
 .PHONY: package
 package:
 	@rm -rf build/package

diff --git a/src/ol/render/webgl/circlereplay.js b/src/ol/render/webgl/circlereplay.js
@@ -7,6 +7,7 @@ goog.require('ol.extent');
 goog.require('ol.obj');
 goog.require('ol.geom.flat.transform');
 goog.require('ol.render.webgl.circlereplay.defaultshader');
+goog.require('ol.render.webgl.circlereplay.defaultshader.Locations');
 goog.require('ol.render.webgl.Replay');
 goog.require('ol.render.webgl');
 goog.require('ol.webgl');
@@ -202,7 +203,6 @@ ol.render.webgl.CircleReplay.prototype.setUpProgram = function(gl, context, size
   // get the locations
   var locations;
   if (!this.defaultLocations_) {
-    // eslint-disable-next-line openlayers-internal/no-missing-requires
     locations = new ol.render.webgl.circlereplay.defaultshader.Locations(gl, program);
     this.defaultLocations_ = locations;
   } else {

diff --git a/src/ol/render/webgl/circlereplay/defaultshader.glsl b/src/ol/render/webgl/circlereplay/defaultshader.glsl
@@ -1,5 +1,4 @@
 //! NAMESPACE=ol.render.webgl.circlereplay.defaultshader
-//! CLASS=ol.render.webgl.circlereplay.defaultshader
 
 
 //! COMMON

diff --git a/src/ol/render/webgl/circlereplay/defaultshader.js b/src/ol/render/webgl/circlereplay/defaultshader.js