con
|
d1023c7614
|
It's 2011 now.
Reviewed-by: hjk
|
2011-01-12 09:46:24 +01:00 |
|
con
|
23c22b7c66
|
License headers, part 2
|
2010-12-17 17:14:20 +01:00 |
|
Rhys Weatherley
|
814c9cc62e
|
Replace the "Qt" GLSL variant with "ES_100"
The Qt variant is almost exactly the same as GLSL/ES,
so there is little point having a separate variant code.
|
2010-12-01 12:30:07 +10:00 |
|
Rhys Weatherley
|
16862432e3
|
Make GLSL highlighter aware of language variant
|
2010-12-01 11:49:36 +10:00 |
|
Rhys Weatherley
|
85aa32dfca
|
Detect GLSL vs GLSL/ES based on mime type
*.vert and *.frag are now for desktop shaders
*.vsh and *.fsh are now for ES shaders
File/New gives the user the choice which to create
|
2010-12-01 10:25:23 +10:00 |
|
Roberto Raggi
|
55234b9d16
|
Implemented some basic code completion.
|
2010-11-29 18:06:21 +01:00 |
|
Roberto Raggi
|
90bf956cc1
|
Simple error recovery.
Well, it's not very advanced but it is probably good enough for now.
|
2010-11-29 09:56:26 +01:00 |
|
Roberto Raggi
|
ad25ec2d94
|
Set up the GLSL variant.
|
2010-11-26 15:58:51 +01:00 |
|
Roberto Raggi
|
0ad583f3e7
|
Detect the type of the shader.
|
2010-11-26 15:15:42 +01:00 |
|
Roberto Raggi
|
1bf87c67aa
|
Initialize the shaders
|
2010-11-26 15:15:42 +01:00 |
|
Roberto Raggi
|
42fbb45b09
|
Report only one error message for line (well, at least for now).
|
2010-11-26 14:26:07 +01:00 |
|
Roberto Raggi
|
61e99b3deb
|
Run the semantic checker and check for invalid function calls.
|
2010-11-26 12:55:55 +01:00 |
|
Roberto Raggi
|
a794154dd7
|
Added indenter, code folding and automagically brace insertion to the GLSL editor.
|
2010-11-26 11:00:21 +01:00 |
|
Roberto Raggi
|
864c3bfc98
|
Added the suffix AST to the ast nodes and some initial work on the GLSL type system.
|
2010-11-25 12:56:16 +01:00 |
|
Rhys Weatherley
|
7ccc6fc7f7
|
Highlight reserved GLSL keywords
|
2010-11-23 17:05:55 +10:00 |
|
Roberto Raggi
|
081166fab0
|
Add the identifiers to the completion box.
Well, this is just a temporary hack :)
|
2010-11-19 15:15:49 +01:00 |
|
Roberto Raggi
|
131df3c3d0
|
Report the syntax errors.
|
2010-11-19 14:59:33 +01:00 |
|
Rhys Weatherley
|
7e4ef22cbd
|
Add extra variant flags for GLSL keywords
|
2010-11-17 10:53:32 +10:00 |
|
Roberto Raggi
|
59004d3dd3
|
Parse GLSL code.
|
2010-11-12 12:45:54 +01:00 |
|
dt
|
4ac7253205
|
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/static.pro
src/plugins/cppeditor/cppeditor.cpp
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
src/plugins/qt4projectmanager/qtoutputformatter.cpp
src/plugins/texteditor/generichighlighter/highlightersettings.cpp
|
2010-11-10 17:02:40 +01:00 |
|
Roberto Raggi
|
959edbe10b
|
Introduced a simple incremental lexer for GLSL.
|
2010-11-10 15:57:39 +01:00 |
|
Roberto Raggi
|
f6eeed0372
|
Initial import of the GLSL editor plug-in.
|
2010-11-10 15:46:41 +01:00 |
|