Showing the changes to libraries/render-utils/src/Model.cpp (1 of 60 files). Show all
Unified · Split
| @@ -299,73 +299,156 @@ void Model::initJointTransforms() { · 298 unmodified lines | ||
| 299 | 299 | |
| 300 | 300 | void Model::init() { |
| 301 | 301 | if (!_program.isLinked()) { |
| 302 | − _program.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 303 | − _program.addShaderFromSourceCode(QGLShader::Fragment, model_frag); | |
| 304 | − initProgram(_program, _locations); | |
| 305 | − | |
| 306 | − _normalMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_normal_map_vert); | |
| 307 | − _normalMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_map_frag); | |
| 308 | − initProgram(_normalMapProgram, _normalMapLocations); | |
| 309 | − | |
| 310 | − _specularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 311 | − _specularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_specular_map_frag); | |
| 312 | − initProgram(_specularMapProgram, _specularMapLocations); | |
| 313 | − | |
| 314 | − _normalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_normal_map_vert); | |
| 315 | − _normalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_specular_map_frag); | |
| 316 | − initProgram(_normalSpecularMapProgram, _normalSpecularMapLocations); | |
| 302 | +/* //Work in progress not used yet | |
| 303 | + gpu::Shader::BindingSet slotBindings; | |
| 304 | + slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), 1)); | |
| 305 | + slotBindings.insert(gpu::Shader::Binding(std::string("diffuseMap"), 0)); | |
| 306 | + slotBindings.insert(gpu::Shader::Binding(std::string("normalMap"), 1)); | |
| 307 | + slotBindings.insert(gpu::Shader::Binding(std::string("specularMap"), 2)); | |
| 308 | + slotBindings.insert(gpu::Shader::Binding(std::string("emissiveMap"), 3)); | |
| 309 | + | |
| 310 | + // Vertex shaders | |
| 311 | + auto modelVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(model_vert))); | |
| 312 | + auto modelNormalMapVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(model_normal_map_vert))); | |
| 313 | + auto modelLightmapVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(model_lightmap_vert))); | |
| 314 | + auto modelLightmapNormalMapVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(model_lightmap_normal_map_vert))); | |
| 315 | + auto modelShadowVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(model_shadow_vert))); | |
| 316 | + auto skinModelVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(skin_model_vert))); | |
| 317 | + auto skinModelNormalMapVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(skin_model_normal_map_vert))); | |
| 318 | + auto skinModelShadowVertex = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(skin_model_shadow_vert))); | |
| 319 | + | |
| 320 | + // Pixel shaders | |
| 321 | + auto modelPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_frag))); | |
| 322 | + auto modelNormalMapPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_normal_map_frag))); | |
| 323 | + auto modelSpecularMapPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_specular_map_frag))); | |
| 324 | + auto modelNormalSpecularMapPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_normal_specular_map_frag))); | |
| 325 | + auto modelTranslucentPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_translucent_frag))); | |
| 326 | + auto modelShadowPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_shadow_frag))); | |
| 327 | + auto modelLightmapPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_lightmap_frag))); | |
| 328 | + auto modelLightmapNormalMapPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_lightmap_normal_map_frag))); | |
| 329 | + auto modelLightmapSpecularMapPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_lightmap_specular_map_frag))); | |
| 330 | + auto modelLightmapNormalSpecularMapPixel = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(model_lightmap_normal_specular_map_frag))); | |
| 331 | + | |
| 332 | + | |
| 333 | + bool makeResult = false; | |
| 334 | + | |
| 335 | + // Programs | |
| 336 | + auto program = gpu::ShaderPointer(gpu::Shader::createProgram(modelVertex, modelPixel)); | |
| 337 | + makeResult = gpu::Shader::makeProgram(*program, slotBindings); | |
| 338 | + | |
| 339 | + auto normalMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelNormalMapVertex, modelNormalMapPixel)); | |
| 340 | + makeResult = gpu::Shader::makeProgram(*normalMapProgram, slotBindings); | |
| 341 | + | |
| 342 | + auto specularMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelVertex, modelSpecularMapPixel)); | |
| 343 | + makeResult = gpu::Shader::makeProgram(*specularMapProgram, slotBindings); | |
| 344 | + | |
| 345 | + auto normalSpecularMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelNormalMapVertex, modelNormalSpecularMapPixel)); | |
| 346 | + makeResult = gpu::Shader::makeProgram(*normalSpecularMapProgram, slotBindings); | |
| 347 | + | |
| 348 | + auto translucentProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelVertex, modelTranslucentPixel)); | |
| 349 | + makeResult = gpu::Shader::makeProgram(*translucentProgram, slotBindings); | |
| 317 | 350 | |
| 318 | − _translucentProgram.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 319 | − _translucentProgram.addShaderFromSourceCode(QGLShader::Fragment, model_translucent_frag); | |
| 320 | − initProgram(_translucentProgram, _translucentLocations); | |
| 321 | − | |
| 322 | − // Lightmap | |
| 323 | − _lightmapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_vert); | |
| 324 | − _lightmapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_frag); | |
| 325 | − initProgram(_lightmapProgram, _lightmapLocations); | |
| 326 | − | |
| 327 | − _lightmapNormalMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_normal_map_vert); | |
| 328 | − _lightmapNormalMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_normal_map_frag); | |
| 329 | − initProgram(_lightmapNormalMapProgram, _lightmapNormalMapLocations); | |
| 330 | − | |
| 331 | − _lightmapSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_vert); | |
| 332 | − _lightmapSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_specular_map_frag); | |
| 333 | − initProgram(_lightmapSpecularMapProgram, _lightmapSpecularMapLocations); | |
| 334 | − | |
| 335 | − _lightmapNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_normal_map_vert); | |
| 336 | − _lightmapNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_normal_specular_map_frag); | |
| 337 | − initProgram(_lightmapNormalSpecularMapProgram, _lightmapNormalSpecularMapLocations); | |
| 338 | − // end lightmap | |
| 351 | + auto shadowProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelShadowVertex, modelShadowPixel)); | |
| 352 | + makeResult = gpu::Shader::makeProgram(*shadowProgram, slotBindings); | |
| 339 | 353 | |
| 354 | + auto lightmapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelLightmapVertex, modelLightmapPixel)); | |
| 355 | + makeResult = gpu::Shader::makeProgram(*lightmapProgram, slotBindings); | |
| 356 | + | |
| 357 | + auto lightmapNormalMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelLightmapNormalMapVertex, modelLightmapNormalMapPixel)); | |
| 358 | + makeResult = gpu::Shader::makeProgram(*lightmapNormalMapProgram, slotBindings); | |
| 359 | + | |
| 360 | + auto lightmapSpecularMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelLightmapVertex, modelLightmapSpecularMapPixel)); | |
| 361 | + makeResult = gpu::Shader::makeProgram(*lightmapSpecularMapProgram, slotBindings); | |
| 362 | + | |
| 363 | + auto lightmapNormalSpecularMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(modelLightmapNormalMapVertex, modelLightmapNormalSpecularMapPixel)); | |
| 364 | + makeResult = gpu::Shader::makeProgram(*lightmapNormalSpecularMapProgram, slotBindings); | |
| 365 | + | |
| 366 | + auto skinProgram = gpu::ShaderPointer(gpu::Shader::createProgram(skinModelVertex, modelPixel)); | |
| 367 | + makeResult = gpu::Shader::makeProgram(*skinProgram, slotBindings); | |
| 368 | + | |
| 369 | + auto skinNormalMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(skinModelNormalMapVertex, modelNormalMapPixel)); | |
| 370 | + makeResult = gpu::Shader::makeProgram(*skinNormalMapProgram, slotBindings); | |
| 371 | + | |
| 372 | + auto skinSpecularMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(skinModelVertex, modelSpecularMapPixel)); | |
| 373 | + makeResult = gpu::Shader::makeProgram(*skinSpecularMapProgram, slotBindings); | |
| 374 | + | |
| 375 | + auto skinNormalSpecularMapProgram = gpu::ShaderPointer(gpu::Shader::createProgram(skinModelNormalMapVertex, modelNormalSpecularMapPixel)); | |
| 376 | + makeResult = gpu::Shader::makeProgram(*skinNormalSpecularMapProgram, slotBindings); | |
| 340 | 377 | |
| 341 | − _shadowProgram.addShaderFromSourceCode(QGLShader::Vertex, model_shadow_vert); | |
| 342 | − _shadowProgram.addShaderFromSourceCode(QGLShader::Fragment, model_shadow_frag); | |
| 343 | − // Shadow program uses the same locations as standard rendering path but we still need to set the bindings | |
| 344 | − Model::Locations tempLoc; | |
| 345 | − initProgram(_shadowProgram, tempLoc); | |
| 346 | − | |
| 347 | − _skinProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_vert); | |
| 348 | − _skinProgram.addShaderFromSourceCode(QGLShader::Fragment, model_frag); | |
| 349 | − initSkinProgram(_skinProgram, _skinLocations); | |
| 350 | − | |
| 351 | − _skinNormalMapProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_normal_map_vert); | |
| 352 | − _skinNormalMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_map_frag); | |
| 353 | − initSkinProgram(_skinNormalMapProgram, _skinNormalMapLocations); | |
| 354 | − | |
| 355 | − _skinSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 356 | − _skinSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_specular_map_frag); | |
| 357 | − initSkinProgram(_skinSpecularMapProgram, _skinSpecularMapLocations); | |
| 358 | − | |
| 359 | − _skinNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_normal_map_vert); | |
| 360 | − _skinNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_specular_map_frag); | |
| 361 | − initSkinProgram(_skinNormalSpecularMapProgram, _skinNormalSpecularMapLocations); | |
| 362 | − | |
| 363 | − _skinShadowProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_shadow_vert); | |
| 364 | − _skinShadowProgram.addShaderFromSourceCode(QGLShader::Fragment, model_shadow_frag); | |
| 365 | − initSkinProgram(_skinShadowProgram, _skinShadowLocations); | |
| 378 | + auto skinShadowProgram = gpu::ShaderPointer(gpu::Shader::createProgram(skinModelShadowVertex, modelShadowPixel)); | |
| 379 | + makeResult = gpu::Shader::makeProgram(*skinShadowProgram, slotBindings); | |
| 366 | 380 | |
| 381 | + auto skinTranslucentProgram = gpu::ShaderPointer(gpu::Shader::createProgram(skinModelVertex, modelTranslucentPixel)); | |
| 382 | + makeResult = gpu::Shader::makeProgram(*skinTranslucentProgram, slotBindings); | |
| 383 | +*/ | |
| 367 | 384 | |
| 368 | − _skinTranslucentProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_vert); | |
| 385 | + _program.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 386 | + _program.addShaderFromSourceCode(QGLShader::Fragment, model_frag); | |
| 387 | + initProgram(_program, _locations); | |
| 388 | + | |
| 389 | + _normalMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_normal_map_vert); | |
| 390 | + _normalMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_map_frag); | |
| 391 | + initProgram(_normalMapProgram, _normalMapLocations); | |
| 392 | + | |
| 393 | + _specularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 394 | + _specularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_specular_map_frag); | |
| 395 | + initProgram(_specularMapProgram, _specularMapLocations); | |
| 396 | + | |
| 397 | + _normalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_normal_map_vert); | |
| 398 | + _normalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_specular_map_frag); | |
| 399 | + initProgram(_normalSpecularMapProgram, _normalSpecularMapLocations); | |
| 400 | + | |
| 401 | + _translucentProgram.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 402 | + _translucentProgram.addShaderFromSourceCode(QGLShader::Fragment, model_translucent_frag); | |
| 403 | + initProgram(_translucentProgram, _translucentLocations); | |
| 404 | + | |
| 405 | + // Lightmap | |
| 406 | + _lightmapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_vert); | |
| 407 | + _lightmapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_frag); | |
| 408 | + initProgram(_lightmapProgram, _lightmapLocations); | |
| 409 | + | |
| 410 | + _lightmapNormalMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_normal_map_vert); | |
| 411 | + _lightmapNormalMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_normal_map_frag); | |
| 412 | + initProgram(_lightmapNormalMapProgram, _lightmapNormalMapLocations); | |
| 413 | + | |
| 414 | + _lightmapSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_vert); | |
| 415 | + _lightmapSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_specular_map_frag); | |
| 416 | + initProgram(_lightmapSpecularMapProgram, _lightmapSpecularMapLocations); | |
| 417 | + | |
| 418 | + _lightmapNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_lightmap_normal_map_vert); | |
| 419 | + _lightmapNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_lightmap_normal_specular_map_frag); | |
| 420 | + initProgram(_lightmapNormalSpecularMapProgram, _lightmapNormalSpecularMapLocations); | |
| 421 | + // end lightmap | |
| 422 | + | |
| 423 | + | |
| 424 | + _shadowProgram.addShaderFromSourceCode(QGLShader::Vertex, model_shadow_vert); | |
| 425 | + _shadowProgram.addShaderFromSourceCode(QGLShader::Fragment, model_shadow_frag); | |
| 426 | + // Shadow program uses the same locations as standard rendering path but we still need to set the bindings | |
| 427 | + Model::Locations tempLoc; | |
| 428 | + initProgram(_shadowProgram, tempLoc); | |
| 429 | + | |
| 430 | + _skinProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_vert); | |
| 431 | + _skinProgram.addShaderFromSourceCode(QGLShader::Fragment, model_frag); | |
| 432 | + initSkinProgram(_skinProgram, _skinLocations); | |
| 433 | + | |
| 434 | + _skinNormalMapProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_normal_map_vert); | |
| 435 | + _skinNormalMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_map_frag); | |
| 436 | + initSkinProgram(_skinNormalMapProgram, _skinNormalMapLocations); | |
| 437 | + | |
| 438 | + _skinSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, model_vert); | |
| 439 | + _skinSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_specular_map_frag); | |
| 440 | + initSkinProgram(_skinSpecularMapProgram, _skinSpecularMapLocations); | |
| 441 | + | |
| 442 | + _skinNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_normal_map_vert); | |
| 443 | + _skinNormalSpecularMapProgram.addShaderFromSourceCode(QGLShader::Fragment, model_normal_specular_map_frag); | |
| 444 | + initSkinProgram(_skinNormalSpecularMapProgram, _skinNormalSpecularMapLocations); | |
| 445 | + | |
| 446 | + _skinShadowProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_shadow_vert); | |
| 447 | + _skinShadowProgram.addShaderFromSourceCode(QGLShader::Fragment, model_shadow_frag); | |
| 448 | + initSkinProgram(_skinShadowProgram, _skinShadowLocations); | |
| 449 | + | |
| 450 | + | |
| 451 | + _skinTranslucentProgram.addShaderFromSourceCode(QGLShader::Vertex, skin_model_vert); | |
| 369 | 452 | _skinTranslucentProgram.addShaderFromSourceCode(QGLShader::Fragment, model_translucent_frag); |
| 370 | 453 | initSkinProgram(_skinTranslucentProgram, _skinTranslucentLocations); |
| 371 | 454 | } |