Merge pull request #38 from zxg0622/rndComp

add default vertex name
shrinktofit · Jan 11, 2019 · 6c80aba · 6c80aba
2 parents 5a8d819 + f717eef
commit 6c80aba
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/cocos/3d/builtin/effects.js b/cocos/3d/builtin/effects.js
@@ -8,12 +8,12 @@ export default [
         "name": "f4c45e6cc7794309d86202e6ec9036a3871fd1ec167a9e02eb1e1574",
         "vert": `
   attribute vec3 a_position;
-  attribute vec2 a_uv0;
+  attribute vec2 a_texCoord;
   uniform mat4 cc_matWorld;
   varying vec2 v_texCoord;
   void main() {
     gl_Position = cc_matWorld*vec4(a_position, 1.0);
-    v_texCoord = a_uv0;
+    v_texCoord = a_texCoord;
   }
 `,
         "frag": `

diff --git a/cocos/gfx/define.ts b/cocos/gfx/define.ts
@@ -65,6 +65,27 @@ export class GFXObject {
     }
 }
 
+export enum GFXAttributeName {
+    ATTR_POSITION = 'a_position',
+    ATTR_NORMAL = 'a_normal',
+    ATTR_TANGENT = 'a_tangent',
+    ATTR_BITANGENT = 'a_bitangent',
+    ATTR_WEIGHTS = 'a_weights',
+    ATTR_JOINTS = 'a_joints',
+    ATTR_COLOR = 'a_color',
+    ATTR_COLOR1 = 'a_color1',
+    ATTR_COLOR2 = 'a_color2',
+    ATTR_TEX_COORD = 'a_texCoord',
+    ATTR_TEX_COORD1 = 'a_texCoord1',
+    ATTR_TEX_COORD2 = 'a_texCoord2',
+    ATTR_TEX_COORD3 = 'a_texCoord3',
+    ATTR_TEX_COORD4 = 'a_texCoord4',
+    ATTR_TEX_COORD5 = 'a_texCoord5',
+    ATTR_TEX_COORD6 = 'a_texCoord6',
+    ATTR_TEX_COORD7 = 'a_texCoord7',
+    ATTR_TEX_COORD8 = 'a_texCoord8',
+}
+
 export enum GFXType {
     UNKNOWN,
     BOOL,

diff --git a/cocos/renderer/utils.js b/cocos/renderer/utils.js
@@ -2,7 +2,7 @@
 
 import gfx from './gfx';
 import InputAssembler from './core/input-assembler';
-import { GFXBufferUsageBit, GFXMemoryUsageBit, GFXFormat } from '../gfx/define';
+import { GFXBufferUsageBit, GFXMemoryUsageBit, GFXFormat, GFXAttributeName } from '../gfx/define';
 
 /**
  * @param {gfx.Device} device
@@ -32,15 +32,15 @@ export function createIA(device, data) {
     }
 
     let vfmt = [];
-    vfmt.push({ name: gfx.ATTR_POSITION, format: GFXFormat.RGB32F });
+    vfmt.push({ name: GFXAttributeName.ATTR_POSITION, format: GFXFormat.RGB32F });
     if (data.normals) {
-        vfmt.push({ name: gfx.ATTR_NORMAL, format: GFXFormat.RGB32F });
+        vfmt.push({ name: GFXAttributeName.ATTR_NORMAL, format: GFXFormat.RGB32F });
     }
     if (data.uvs) {
-        vfmt.push({ name: gfx.ATTR_UV0, format: GFXFormat.RG32F });
+        vfmt.push({ name: GFXAttributeName.ATTR_TEX_COORD, format: GFXFormat.RG32F });
     }
     if (data.colors) {
-        vfmt.push({ name: gfx.ATTR_COLOR, format: GFXFormat.RGB32F });
+        vfmt.push({ name: GFXAttributeName.ATTR_COLOR, format: GFXFormat.RGB32F });
     }
 
     let vb = cc.director.root.device.createBuffer({