Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New getDefaultShaderModules API #1168

Merged
merged 3 commits into from
Jul 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/core/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ export {default as CameraNode} from './scenegraph/nodes/camera-node';
export {
registerShaderModules,
setDefaultShaderModules,
getDefaultShaderModules,
assembleShaders,
createShaderHook,
createModuleInjection,
Expand Down
6 changes: 5 additions & 1 deletion modules/shadertools/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import MODULAR_VS from './shaders/modular-vertex.glsl';
import MODULAR_FS from './shaders/modular-fragment.glsl';

// DOCUMENTED APIS
export {registerShaderModules, setDefaultShaderModules} from './lib/resolve-modules';
export {
registerShaderModules,
setDefaultShaderModules,
getDefaultShaderModules
} from './lib/resolve-modules';
export {assembleShaders, createShaderHook, createModuleInjection} from './lib/assemble-shaders';

// HELPERS
Expand Down
4 changes: 4 additions & 0 deletions modules/shadertools/src/lib/resolve-modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ export function setDefaultShaderModules(modules) {
shaderModuleRegistry.setDefaultShaderModules(modules);
}

export function getDefaultShaderModules() {
return shaderModuleRegistry.getDefaultShaderModules();
}

/**
* Registers an array of shader modules
* @param {Object[]} shaderModuleList - Array of shader modules
Expand Down
4 changes: 4 additions & 0 deletions modules/shadertools/src/lib/shader-module-registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ export default class ShaderModuleRegistry {
this.defaultShaderModules = this.resolveModules(modules);
}

getDefaultShaderModules() {
return this.defaultShaderModules;
}

registerShaderModules(shaderModuleList, {ignoreMultipleRegistrations = false} = {}) {
for (const shaderModule of shaderModuleList) {
this._registerShaderModule(shaderModule, ignoreMultipleRegistrations);
Expand Down
27 changes: 26 additions & 1 deletion modules/shadertools/test/lib/resolve-modules.spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import test from 'tape-catch';
import {resolveModules, TEST_EXPORTS} from '@luma.gl/shadertools/lib/resolve-modules';
import {
resolveModules,
TEST_EXPORTS,
setDefaultShaderModules,
getDefaultShaderModules
} from '@luma.gl/shadertools/lib/resolve-modules';

const {getDependencyGraph} = TEST_EXPORTS;

// Dummy shader modules with dependencies
Expand All @@ -24,6 +30,25 @@ const project64 = {
test('ShaderModules#import', t => {
t.ok(resolveModules !== undefined, 'resolveModules import successful');
t.ok(getDependencyGraph !== undefined, 'getDependencyGraph import successful');
t.ok(setDefaultShaderModules !== undefined, 'setDefaultShaderModules import successful');
t.ok(getDefaultShaderModules !== undefined, 'getDefaultShaderModules import successful');
t.end();
});

test('ShaderModules#setAndgetDefaultShaderModules', t => {
let modules = [fp32, fp64, project];
setDefaultShaderModules(modules);
const savedModules1 = getDefaultShaderModules();
t.equal(savedModules1.length, 3, 'setDefaultShaderModules is ok');
modules = [fp32, fp64];
setDefaultShaderModules(modules);
let savedModules2 = getDefaultShaderModules();
savedModules2.push(project);
setDefaultShaderModules(savedModules2);
savedModules2 = getDefaultShaderModules();
setDefaultShaderModules([]);
t.equal(savedModules1.length, savedModules2.length, 'getDefaultShaderModules is ok');

t.end();
});

Expand Down