Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
ibgreen committed Feb 26, 2024
1 parent e864a3e commit 31c0224
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions modules/engine/src/model/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Copyright (c) vis.gl contributors

import type {TypedArray} from '@luma.gl/core';
import type {DeviceFeature, RenderPipelineProps, RenderPipelineParameters,} from '@luma.gl/core';
import type {Shader, Buffer, BufferLayout, VertexArray, TransformFeedback} from '@luma.gl/core';
import type {DeviceFeature, RenderPipelineProps, RenderPipelineParameters} from '@luma.gl/core';
import type {Shader, BufferLayout, VertexArray, TransformFeedback} from '@luma.gl/core';
import type {AttributeInfo, Binding, UniformValue, PrimitiveTopology} from '@luma.gl/core';
import { Device, RenderPipeline, RenderPass, UniformStore} from '@luma.gl/core';
import {Device, Buffer, RenderPipeline, RenderPass, UniformStore} from '@luma.gl/core';
import {log, uid, deepEqual, splitUniformsAndBindings, isNumberArray} from '@luma.gl/core';
import {getTypedArrayFromDataType, getAttributeInfosFromLayouts} from '@luma.gl/core';
import type {ShaderModule, PlatformInfo} from '@luma.gl/shadertools';
Expand Down Expand Up @@ -226,8 +226,7 @@ export class Model {

this.pipelineFactory =
props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);
this.shaderFactory =
props.shaderFactory || ShaderFactory.getDefaultShaderFactory(this.device);
this.shaderFactory = props.shaderFactory || ShaderFactory.getDefaultShaderFactory(this.device);

// Create the pipeline
// @note order is important
Expand Down Expand Up @@ -597,11 +596,11 @@ export class Model {

const fs = this.fs
? this.shaderFactory.createShader({
id: `${this.id}-fragment`,
stage: 'fragment',
source: this.fs,
debug: this.props.debugShaders
})
id: `${this.id}-fragment`,

Check warning on line 599 in modules/engine/src/model/model.ts

View workflow job for this annotation

GitHub Actions / test (18)

Expected indentation of 10 spaces but found 12
stage: 'fragment',

Check warning on line 600 in modules/engine/src/model/model.ts

View workflow job for this annotation

GitHub Actions / test (18)

Expected indentation of 10 spaces but found 12
source: this.fs,

Check warning on line 601 in modules/engine/src/model/model.ts

View workflow job for this annotation

GitHub Actions / test (18)

Expected indentation of 10 spaces but found 12
debug: this.props.debugShaders

Check warning on line 602 in modules/engine/src/model/model.ts

View workflow job for this annotation

GitHub Actions / test (18)

Expected indentation of 10 spaces but found 12
})

Check warning on line 603 in modules/engine/src/model/model.ts

View workflow job for this annotation

GitHub Actions / test (18)

Expected indentation of 8 spaces but found 10
: null;

this.pipeline = this.pipelineFactory.createRenderPipeline({
Expand Down

0 comments on commit 31c0224

Please sign in to comment.