update resource references to use Qt resource system

Stephen Birarda committed 12 years ago

Commit 403f91c1 parent cc554c528 files · +60 −378Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 28 files). Show all

Unified · Split

@@ -496,16 +496,15 @@ void VoxelSystem::initVoxelMemory() { · 495 unmodified lines
496	496
497	497	// create our simple fragment shader if we're the first system to init
498	498	if (!_perlinModulateProgram.isLinked()) {
499		− switchToResourcesParentIfRequired();
500		− _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Vertex, "resources/shaders/perlin_modulate.vert");
501		− _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Fragment, "resources/shaders/perlin_modulate.frag");
	499	+ _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Vertex, ":/shaders/perlin_modulate.vert");
	500	+ _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Fragment, ":/shaders/perlin_modulate.frag");
502	501	_perlinModulateProgram.link();
503	502
504	503	_perlinModulateProgram.bind();
505	504	_perlinModulateProgram.setUniformValue("permutationNormalTexture", 0);
506	505	_perlinModulateProgram.release();
507	506
508		− _shadowMapProgram.addShaderFromSourceFile(QGLShader::Fragment, "resources/shaders/shadow_map.frag");
	507	+ _shadowMapProgram.addShaderFromSourceFile(QGLShader::Fragment, ":/shaders/shadow_map.frag");
509	508	_shadowMapProgram.link();
510	509
511	510	_shadowMapProgram.bind();