From 32eb504bcee89cfcc6d24e5eaae0d27d137d8abb Mon Sep 17 00:00:00 2001 From: crazybutcher Date: Wed, 16 Sep 2009 13:49:53 +0000 Subject: [PATCH] improved Cg syntax highlighter and autocomplete --- api/cg/stdlib.lua | 16 ++++++++++++++-- spec/cg.lua | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/api/cg/stdlib.lua b/api/cg/stdlib.lua index 932e313148..0dcc6d340a 100644 --- a/api/cg/stdlib.lua +++ b/api/cg/stdlib.lua @@ -170,10 +170,22 @@ TEXCOORD15 NORMAL ATTR0 ATTR1 ATTR2 ATTR3 ATTR4 ATTR5 ATTR6 ATTR7 ATTR8 ATTR9 ATTR10 ATTR11 ATTR12 ATTR13 ATTR14 ATTR15 TEXUNIT0 TEXUNIT1 TEXUNIT2 TEXUNIT3 TEXUNIT4 TEXUNIT5 TEXUNIT6 TEXUNIT7 TEXUNIT8 TEXUNIT9 TEXUNIT10 TEXUNIT11 TEXUNIT12 -TEXUNIT13 TEXUNIT14 TEXUNIT15 ]] +TEXUNIT13 TEXUNIT14 TEXUNIT15 + +PROJ PROJECTION PROJECTIONMATRIX PROJMATRIX +PROJMATRIXINV PROJINV PROJECTIONINV PROJINVERSE PROJECTIONINVERSE PROJINVMATRIX PROJECTIONINVMATRIX PROJINVERSEMATRIX PROJECTIONINVERSEMATRIX +VIEW VIEWMATRIX VIEWMATRIXINV VIEWINV VIEWINVERSE VIEWINVERSEMATRIX VIEWINVMATRIX +VIEWPROJECTION VIEWPROJ VIEWPROJMATRIX VIEWPROJECTIONMATRIX +WORLD WORLDMATRIX WORLDVIEW WORLDVIEWMATRIX +WORLDVIEWPROJ WORLDVIEWPROJECTION WORLDVIEWPROJMATRIX WORLDVIEWPROJECTIONMATRIX +VIEWPORTSIZE VIEWPORTDIMENSION +VIEWPORTSIZEINV VIEWPORTSIZEINVERSE VIEWPORTDIMENSIONINV VIEWPORTDIMENSIONINVERSE INVERSEVIEWPORTDIMENSIONS +FOGCOLOR FOGDISTANCE CAMERAWORLDPOS CAMERAWORLDDIR + +]] -- keywords - shouldn't be left out -for w in keyw:gmatch(keyw,"([a-zA-Z_0-9]+)") do +for w in keyw:gmatch("([a-zA-Z_0-9]+)") do key(w) end diff --git a/spec/cg.lua b/spec/cg.lua index 110c99da83..fe4aa8753a 100644 --- a/spec/cg.lua +++ b/spec/cg.lua @@ -64,7 +64,20 @@ return { NORMAL FACE PRIMITIVEID DEPTH ATTR0 ATTR1 ATTR2 ATTR3 ATTR4 ATTR5 ATTR6 ATTR7 ATTR8 ATTR9 ATTR10 ATTR11 ATTR12 ATTR13 ATTR14 ATTR15 TEXUNIT0 TEXUNIT1 TEXUNIT2 TEXUNIT3 TEXUNIT4 TEXUNIT5 TEXUNIT6 TEXUNIT7 TEXUNIT8 TEXUNIT9 - TEXUNIT10 TEXUNIT11 TEXUNIT12 TEXUNIT13 TEXUNIT14 TEXUNIT15 x y z w + TEXUNIT10 TEXUNIT11 TEXUNIT12 TEXUNIT13 TEXUNIT14 TEXUNIT15 + + PROJ PROJECTION PROJECTIONMATRIX PROJMATRIX + PROJMATRIXINV PROJINV PROJECTIONINV PROJINVERSE PROJECTIONINVERSE PROJINVMATRIX PROJECTIONINVMATRIX PROJINVERSEMATRIX PROJECTIONINVERSEMATRIX + VIEW VIEWMATRIX VIEWMATRIXINV VIEWINV VIEWINVERSE VIEWINVERSEMATRIX VIEWINVMATRIX + VIEWPROJECTION VIEWPROJ VIEWPROJMATRIX VIEWPROJECTIONMATRIX + WORLD WORLDMATRIX WORLDVIEW WORLDVIEWMATRIX + WORLDVIEWPROJ WORLDVIEWPROJECTION WORLDVIEWPROJMATRIX WORLDVIEWPROJECTIONMATRIX + VIEWPORTSIZE VIEWPORTDIMENSION + VIEWPORTSIZEINV VIEWPORTSIZEINVERSE VIEWPORTDIMENSIONINV VIEWPORTDIMENSIONINVERSE INVERSEVIEWPORTDIMENSIONS + FOGCOLOR FOGDISTANCE CAMERAWORLDPOS CAMERAWORLDDIR + + + x y z w xxxx xxxy xxxz xxxw xxyx xxyy xxyz xxyw xxzx xxzy xxzz xxzw xxwx xxwy xxwz xxww xyxx xyxy xyxz xyxw xyyx xyyy xyyz xyyw xyzx xyzy xyzz xyzw xywx xywy