VPS
Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 959 vs 963 for /trunk/Source Code/Platform/Video/Headers/GFXDevice.h

Diff revisions: vs.
  @@ -371,7 +371,7 @@
371 371 void onCameraUpdate(const Camera& camera);
372 372 void onCameraChange(const Camera& camera);
373 373
374 - void flushDisplay(const vec4<I32>& targetViewport);
374 + void blitToScreen(const vec4<I32>& targetViewport);
375 375
376 376 protected:
377 377 friend class SceneManager;
  @@ -396,7 +396,7 @@
396 396 private:
397 397 /// Upload draw related data to the GPU (view & projection matrices, viewport settings, etc)
398 398 void uploadGPUBlock();
399 - void setClipPlanes(const ClipPlaneList& clipPlanes);
399 + void setClipPlanes(const FrustumClipPlanes& clipPlanes);
400 400 void renderFromCamera(Camera& camera);
401 401
402 402 ErrorCode createAPIInstance();
  @@ -441,7 +441,7 @@
441 441 size_t _state2DRenderingHash;
442 442 size_t _stateDepthOnlyRenderingHash;
443 443 /// The interpolation factor between the current and the last frame
444 - ClipPlaneList _clippingPlanes;
444 + FrustumClipPlanes _clippingPlanes;
445 445
446 446 bool _2DRendering;
447 447 // number of draw calls (rough estimate)
  @@ -528,8 +528,8 @@
528 528 device.onCameraChange(camera);
529 529 }
530 530
531 - static void flushDisplay(GFXDevice& device, const vec4<I32>& targetViewport) {
532 - device.flushDisplay(targetViewport);
531 + static void blitToScreen(GFXDevice& device, const vec4<I32>& targetViewport) {
532 + device.blitToScreen(targetViewport);
533 533 }
534 534
535 535 static void onChangeWindowSize(GFXDevice& device, U16 w, U16 h) {
  @@ -573,11 +573,12 @@
573 573 device.renderFromCamera(camera);
574 574 }
575 575
576 - static void setClippingPlanes(GFXDevice& device, const ClipPlaneList& clippingPlanes) {
576 + static void setClippingPlanes(GFXDevice& device, const FrustumClipPlanes& clippingPlanes) {
577 577 device.setClipPlanes(clippingPlanes);
578 578 }
579 +
579 580 /// Get the entire list of clipping planes
580 - static const ClipPlaneList& getClippingPlanes(GFXDevice& device) {
581 + static const FrustumClipPlanes& getClippingPlanes(GFXDevice& device) {
581 582 return device._clippingPlanes;
582 583 }
583 584