Changeset 8744:0e4e4f78fc13 in orange
- Timestamp:
- 08/23/11 17:34:28 (21 months ago)
- Branch:
- default
- Convert:
- 4f276762ba4b1806f8d90800488b2836b19d3eb4
- Location:
- orange/OrangeWidgets/plot
- Files:
-
- 1 added
- 2 edited
-
noise.jpg (added)
-
owplot3d.py (modified) (2 diffs)
-
symbol.fs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
orange/OrangeWidgets/plot/owplot3d.py
r8743 r8744 565 565 self.use_fbos = False 566 566 567 img = QImage(os.path.join(os.path.dirname(__file__), 'noise.jpg')) 568 self.fractal_texture = self.bindTexture(img) 569 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR) 570 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR) 571 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT) 572 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT) 573 567 574 def resizeGL(self, width, height): 568 575 pass … … 629 636 self.symbol_program.setUniformValue(self.symbol_program_translation, *self.plot_translation) 630 637 self.symbol_program.setUniformValue(self.symbol_program_force_color, 0., 0., 0., 0.) 638 if self.use_2d_symbols: 639 self.symbol_program.setUniformValue('texture', 0) 640 self.symbol_program.setUniformValue('apply_texture', True) 641 self.symbol_program.setUniformValue('screen_size', self.width(), self.height()) 642 glActiveTexture(GL_TEXTURE0) 643 glBindTexture(GL_TEXTURE_2D, self.fractal_texture) 644 else: 645 self.symbol_program.setUniformValue('apply_texture', False) 631 646 632 647 glEnable(GL_DEPTH_TEST) -
orange/OrangeWidgets/plot/symbol.fs
r8721 r8744 2 2 3 3 in vec4 var_color; 4 uniform bool apply_texture; 5 uniform sampler2D texture; 6 uniform vec2 screen_size; 4 7 5 8 void main(void) 6 9 { 7 gl_FragColor = var_color; 10 if (apply_texture) 11 { 12 gl_FragColor = mix(var_color, texture2D(texture, vec2(10., 10.)*gl_FragCoord.xy/screen_size), 0.3); 13 } 14 else 15 { 16 gl_FragColor = var_color; 17 } 8 18 }
Note: See TracChangeset
for help on using the changeset viewer.
