diff --git a/.eslintrc.js b/.eslintrc.js index b46ba964b2..e748139a22 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { globals: { - "AMap": true, - "L7": true, + 'AMap': true, + 'L7': true, }, env: { browser: true, @@ -15,9 +15,9 @@ module.exports = { ecmaVersion: 12, sourceType: 'module' }, - plugins: ['@typescript-eslint',"unused-imports"], + plugins: ['@typescript-eslint','unused-imports'], rules: { - "unused-imports/no-unused-imports": "error", + 'unused-imports/no-unused-imports': 'error', '@typescript-eslint/no-loss-of-precision':0, '@typescript-eslint/no-inferrable-types': 0, 'no-constant-condition': 0, @@ -29,7 +29,8 @@ module.exports = { 'no-useless-catch': 0, '@typescript-eslint/explicit-module-boundary-types': 0, '@typescript-eslint/no-explicit-any':0, - "@typescript-eslint/no-unused-vars": 0, + '@typescript-eslint/no-unused-vars': 0, + '@typescript-eslint/no-duplicate-enum-values':0, 'prefer-rest-params':0, }, settings: { diff --git a/packages/core/src/services/shader/ShaderModuleService.ts b/packages/core/src/services/shader/ShaderModuleService.ts index 97cbb823d6..cac86a1101 100644 --- a/packages/core/src/services/shader/ShaderModuleService.ts +++ b/packages/core/src/services/shader/ShaderModuleService.ts @@ -56,6 +56,8 @@ export default class ShaderModuleService implements IShaderModuleService { // return; // } + moduleParams.vs = moduleParams.vs.replace(/\r\n/g, '\n'); // 将所有的\r\n替换为\n + moduleParams.fs = moduleParams.fs.replace(/\r\n/g, '\n'); // 将所有的\r\n替换为\n const { vs, fs, uniforms: declaredUniforms, inject } = moduleParams; const { content: extractedVS, uniforms: vsUniforms } = extractUniforms(vs); const { content: extractedFS, uniforms: fsUniforms } = extractUniforms(fs);