Просмотр исходного кода

Fixed ray picking in retina display mode

Ivan Safrin 12 лет назад
Родитель
Сommit
8483490abf
100 измененных файлов с 6 добавлено и 6 удалено
  1. 2 2
      Core/Contents/Source/PolyGLRenderer.cpp
  2. 1 1
      Core/Contents/Source/PolyScene.cpp
  3. 3 3
      IDE/Assets/ide_icons.ai
  4. BIN
      IDE/Contents/Resources/Images/PostPreview/oranges.png
  5. BIN
      IDE/Contents/Resources/Images/ScreenEditor/arrow.png
  6. BIN
      IDE/Contents/Resources/Images/ScreenEditor/entity_marker.png
  7. BIN
      IDE/Contents/Resources/Images/ScreenEditor/image.png
  8. BIN
      IDE/Contents/Resources/Images/ScreenEditor/link.png
  9. BIN
      IDE/Contents/Resources/Images/ScreenEditor/pan.png
  10. BIN
      IDE/Contents/Resources/Images/ScreenEditor/screenCenter.png
  11. BIN
      IDE/Contents/Resources/Images/ScreenEditor/screen_entity.png
  12. BIN
      IDE/Contents/Resources/Images/ScreenEditor/screen_sound.png
  13. BIN
      IDE/Contents/Resources/Images/ScreenEditor/screen_sound_icon.png
  14. BIN
      IDE/Contents/Resources/Images/ScreenEditor/selector.png
  15. BIN
      IDE/Contents/Resources/Images/ScreenEditor/shape.png
  16. BIN
      IDE/Contents/Resources/Images/ScreenEditor/sound.png
  17. BIN
      IDE/Contents/Resources/Images/ScreenEditor/sprite_icon.png
  18. BIN
      IDE/Contents/Resources/Images/ScreenEditor/text.png
  19. BIN
      IDE/Contents/Resources/Images/ScreenEditor/transform_base.png
  20. BIN
      IDE/Contents/Resources/Images/ScreenEditor/transform_rotator.png
  21. BIN
      IDE/Contents/Resources/Images/ScreenEditor/transform_scaler.png
  22. BIN
      IDE/Contents/Resources/Images/ScreenEditor/zoom.png
  23. BIN
      IDE/Contents/Resources/Images/about.png
  24. BIN
      IDE/Contents/Resources/Images/arrow_add.png
  25. BIN
      IDE/Contents/Resources/Images/arrow_remove.png
  26. BIN
      IDE/Contents/Resources/Images/barClose.png
  27. BIN
      IDE/Contents/Resources/Images/barlogo.png
  28. BIN
      IDE/Contents/Resources/Images/bezier_handle.png
  29. BIN
      IDE/Contents/Resources/Images/bezier_point.png
  30. BIN
      IDE/Contents/Resources/Images/biglogo.png
  31. BIN
      IDE/Contents/Resources/Images/box_icon.png
  32. BIN
      IDE/Contents/Resources/Images/clear_buffer_icon.png
  33. BIN
      IDE/Contents/Resources/Images/collapse.png
  34. BIN
      IDE/Contents/Resources/Images/console_hide_button.png
  35. BIN
      IDE/Contents/Resources/Images/corner_resize.png
  36. BIN
      IDE/Contents/Resources/Images/cubemap_icon.png
  37. BIN
      IDE/Contents/Resources/Images/curve_editor_bg.png
  38. BIN
      IDE/Contents/Resources/Images/curve_icon.png
  39. BIN
      IDE/Contents/Resources/Images/editorGrid.png
  40. BIN
      IDE/Contents/Resources/Images/editor_hsplit.png
  41. BIN
      IDE/Contents/Resources/Images/editor_mergesplit.png
  42. BIN
      IDE/Contents/Resources/Images/editor_vsplit.png
  43. BIN
      IDE/Contents/Resources/Images/entity_editor/move_gizmo.png
  44. BIN
      IDE/Contents/Resources/Images/entity_editor/new_entity.png
  45. BIN
      IDE/Contents/Resources/Images/entity_editor/rotate_gizmo.png
  46. BIN
      IDE/Contents/Resources/Images/entity_editor/scale_gizmo.png
  47. BIN
      IDE/Contents/Resources/Images/entity_editor/sidebar.png
  48. BIN
      IDE/Contents/Resources/Images/entity_editor/siderbar_separator.png
  49. BIN
      IDE/Contents/Resources/Images/entity_icon.png
  50. BIN
      IDE/Contents/Resources/Images/entity_thumb.png
  51. BIN
      IDE/Contents/Resources/Images/expand.png
  52. BIN
      IDE/Contents/Resources/Images/fontBox.png
  53. BIN
      IDE/Contents/Resources/Images/font_icon.png
  54. BIN
      IDE/Contents/Resources/Images/function_icon.png
  55. BIN
      IDE/Contents/Resources/Images/invisible.png
  56. BIN
      IDE/Contents/Resources/Images/link_entity.png
  57. BIN
      IDE/Contents/Resources/Images/material_bg.png
  58. BIN
      IDE/Contents/Resources/Images/material_editor_light.png
  59. BIN
      IDE/Contents/Resources/Images/material_grid.png
  60. BIN
      IDE/Contents/Resources/Images/material_icon.png
  61. BIN
      IDE/Contents/Resources/Images/new_cubemap.png
  62. BIN
      IDE/Contents/Resources/Images/new_layer.png
  63. BIN
      IDE/Contents/Resources/Images/new_material.png
  64. BIN
      IDE/Contents/Resources/Images/new_screenshader.png
  65. BIN
      IDE/Contents/Resources/Images/new_shader.png
  66. BIN
      IDE/Contents/Resources/Images/new_tab_button.png
  67. BIN
      IDE/Contents/Resources/Images/particle_system_icon.png
  68. BIN
      IDE/Contents/Resources/Images/particle_system_icon_editor.png
  69. BIN
      IDE/Contents/Resources/Images/plane_icon.png
  70. BIN
      IDE/Contents/Resources/Images/play_button.png
  71. BIN
      IDE/Contents/Resources/Images/play_icon.png
  72. BIN
      IDE/Contents/Resources/Images/reload_icon.png
  73. BIN
      IDE/Contents/Resources/Images/remove_icon.png
  74. BIN
      IDE/Contents/Resources/Images/replaceAll.png
  75. BIN
      IDE/Contents/Resources/Images/screenTransform.png
  76. BIN
      IDE/Contents/Resources/Images/screenshader_icon.png
  77. BIN
      IDE/Contents/Resources/Images/shader_icon.png
  78. BIN
      IDE/Contents/Resources/Images/shader_thumb.png
  79. BIN
      IDE/Contents/Resources/Images/small_selector.png
  80. BIN
      IDE/Contents/Resources/Images/sound_thumb.png
  81. BIN
      IDE/Contents/Resources/Images/sphere_icon.png
  82. BIN
      IDE/Contents/Resources/Images/sprite_thumb.png
  83. BIN
      IDE/Contents/Resources/Images/stop_button.png
  84. BIN
      IDE/Contents/Resources/Images/tab_bg.png
  85. BIN
      IDE/Contents/Resources/Images/tab_close_button.png
  86. BIN
      IDE/Contents/Resources/Images/target_layer.png
  87. BIN
      IDE/Contents/Resources/Images/torus_icon.png
  88. BIN
      IDE/Contents/Resources/Images/trash.png
  89. BIN
      IDE/Contents/Resources/Images/visible.png
  90. BIN
      IDE/Contents/Resources/Images/welcome.png
  91. BIN
      IDE/Contents/Resources/UIThemes/dark/checkbox_checked.png
  92. BIN
      IDE/Contents/Resources/UIThemes/dark/checkbox_unchecked.png
  93. BIN
      IDE/Contents/Resources/UIThemes/dark/colorPickerTarget.png
  94. BIN
      IDE/Contents/Resources/UIThemes/dark/combobox_bg.png
  95. BIN
      IDE/Contents/Resources/UIThemes/dark/combobox_drop.png
  96. BIN
      IDE/Contents/Resources/UIThemes/dark/menu_bg.png
  97. BIN
      IDE/Contents/Resources/UIThemes/dark/menu_selector.png
  98. BIN
      IDE/Contents/Resources/UIThemes/dark/projectIcon.png
  99. BIN
      IDE/Contents/Resources/UIThemes/dark/templateIcon.png
  100. BIN
      IDE/Contents/Resources/UIThemes/dark/textfield_multi.png

+ 2 - 2
Core/Contents/Source/PolyGLRenderer.cpp

@@ -319,8 +319,8 @@ Vector3 OpenGLRenderer::projectRayFrom2DCoordinate(Number x, Number y, const Mat
 		_sceneProjectionMatrix[i] = projectionMatrix.ml[i];
 	}
 
-	gluUnProject(x, yRes - y, 0.0, mv, _sceneProjectionMatrix, vp, &nearPlane[0], &nearPlane[1], &nearPlane[2]);
-	gluUnProject(x, yRes - y, 1.0, mv, _sceneProjectionMatrix, vp, &farPlane[0], &farPlane[1], &farPlane[2]);
+	gluUnProject(x, (yRes*backingResolutionScaleY) - y, 0.0, mv, _sceneProjectionMatrix, vp, &nearPlane[0], &nearPlane[1], &nearPlane[2]);
+	gluUnProject(x, (yRes*backingResolutionScaleY) - y, 1.0, mv, _sceneProjectionMatrix, vp, &farPlane[0], &farPlane[1], &farPlane[2]);
 
 	Vector3 nearVec(nearPlane[0], nearPlane[1], nearPlane[2]);
 	Vector3 farVec(farPlane[0], farPlane[1], farPlane[2]);

+ 1 - 1
Core/Contents/Source/PolyScene.cpp

@@ -270,7 +270,7 @@ Ray Scene::projectRayFromCameraAndViewportCoordinate(Camera *camera, Vector2 coo
 	Polycode::Rectangle viewport = camera->getViewport();
 	viewport.x = sceneMouseAdjust.x * renderer->getBackingResolutionScaleX();
 	viewport.y = sceneMouseAdjust.y * renderer->getBackingResolutionScaleY();
-    
+        
 	Vector3 dir =  renderer->projectRayFrom2DCoordinate(coordinate.x *  renderer->getBackingResolutionScaleX(), coordinate.y  * renderer->getBackingResolutionScaleY(), camera->getConcatenatedMatrix(), camera->getProjectionMatrix(), viewport);
 	Vector3 pos;
 

Разница между файлами не показана из-за своего большого размера
+ 3 - 3
IDE/Assets/ide_icons.ai


BIN
IDE/Contents/Resources/Images/PostPreview/oranges.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/arrow.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/entity_marker.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/image.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/link.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/pan.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/screenCenter.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/screen_entity.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/screen_sound.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/screen_sound_icon.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/selector.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/shape.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/sound.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/sprite_icon.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/text.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/transform_base.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/transform_rotator.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/transform_scaler.png


BIN
IDE/Contents/Resources/Images/ScreenEditor/zoom.png


BIN
IDE/Contents/Resources/Images/about.png


BIN
IDE/Contents/Resources/Images/arrow_add.png


BIN
IDE/Contents/Resources/Images/arrow_remove.png


BIN
IDE/Contents/Resources/Images/barClose.png


BIN
IDE/Contents/Resources/Images/barlogo.png


BIN
IDE/Contents/Resources/Images/bezier_handle.png


BIN
IDE/Contents/Resources/Images/bezier_point.png


BIN
IDE/Contents/Resources/Images/biglogo.png


BIN
IDE/Contents/Resources/Images/box_icon.png


BIN
IDE/Contents/Resources/Images/clear_buffer_icon.png


BIN
IDE/Contents/Resources/Images/collapse.png


BIN
IDE/Contents/Resources/Images/console_hide_button.png


BIN
IDE/Contents/Resources/Images/corner_resize.png


BIN
IDE/Contents/Resources/Images/cubemap_icon.png


BIN
IDE/Contents/Resources/Images/curve_editor_bg.png


BIN
IDE/Contents/Resources/Images/curve_icon.png


BIN
IDE/Contents/Resources/Images/editorGrid.png


BIN
IDE/Contents/Resources/Images/editor_hsplit.png


BIN
IDE/Contents/Resources/Images/editor_mergesplit.png


BIN
IDE/Contents/Resources/Images/editor_vsplit.png


BIN
IDE/Contents/Resources/Images/entity_editor/move_gizmo.png


BIN
IDE/Contents/Resources/Images/entity_editor/new_entity.png


BIN
IDE/Contents/Resources/Images/entity_editor/rotate_gizmo.png


BIN
IDE/Contents/Resources/Images/entity_editor/scale_gizmo.png


BIN
IDE/Contents/Resources/Images/entity_editor/sidebar.png


BIN
IDE/Contents/Resources/Images/entity_editor/siderbar_separator.png


BIN
IDE/Contents/Resources/Images/entity_icon.png


BIN
IDE/Contents/Resources/Images/entity_thumb.png


BIN
IDE/Contents/Resources/Images/expand.png


BIN
IDE/Contents/Resources/Images/fontBox.png


BIN
IDE/Contents/Resources/Images/font_icon.png


BIN
IDE/Contents/Resources/Images/function_icon.png


BIN
IDE/Contents/Resources/Images/invisible.png


BIN
IDE/Contents/Resources/Images/link_entity.png


BIN
IDE/Contents/Resources/Images/material_bg.png


BIN
IDE/Contents/Resources/Images/material_editor_light.png


BIN
IDE/Contents/Resources/Images/material_grid.png


BIN
IDE/Contents/Resources/Images/material_icon.png


BIN
IDE/Contents/Resources/Images/new_cubemap.png


BIN
IDE/Contents/Resources/Images/new_layer.png


BIN
IDE/Contents/Resources/Images/new_material.png


BIN
IDE/Contents/Resources/Images/new_screenshader.png


BIN
IDE/Contents/Resources/Images/new_shader.png


BIN
IDE/Contents/Resources/Images/new_tab_button.png


BIN
IDE/Contents/Resources/Images/particle_system_icon.png


BIN
IDE/Contents/Resources/Images/particle_system_icon_editor.png


BIN
IDE/Contents/Resources/Images/plane_icon.png


BIN
IDE/Contents/Resources/Images/play_button.png


BIN
IDE/Contents/Resources/Images/play_icon.png


BIN
IDE/Contents/Resources/Images/reload_icon.png


BIN
IDE/Contents/Resources/Images/remove_icon.png


BIN
IDE/Contents/Resources/Images/replaceAll.png


BIN
IDE/Contents/Resources/Images/screenTransform.png


BIN
IDE/Contents/Resources/Images/screenshader_icon.png


BIN
IDE/Contents/Resources/Images/shader_icon.png


BIN
IDE/Contents/Resources/Images/shader_thumb.png


BIN
IDE/Contents/Resources/Images/small_selector.png


BIN
IDE/Contents/Resources/Images/sound_thumb.png


BIN
IDE/Contents/Resources/Images/sphere_icon.png


BIN
IDE/Contents/Resources/Images/sprite_thumb.png


BIN
IDE/Contents/Resources/Images/stop_button.png


BIN
IDE/Contents/Resources/Images/tab_bg.png


BIN
IDE/Contents/Resources/Images/tab_close_button.png


BIN
IDE/Contents/Resources/Images/target_layer.png


BIN
IDE/Contents/Resources/Images/torus_icon.png


BIN
IDE/Contents/Resources/Images/trash.png


BIN
IDE/Contents/Resources/Images/visible.png


BIN
IDE/Contents/Resources/Images/welcome.png


BIN
IDE/Contents/Resources/UIThemes/dark/checkbox_checked.png


BIN
IDE/Contents/Resources/UIThemes/dark/checkbox_unchecked.png


BIN
IDE/Contents/Resources/UIThemes/dark/colorPickerTarget.png


BIN
IDE/Contents/Resources/UIThemes/dark/combobox_bg.png


BIN
IDE/Contents/Resources/UIThemes/dark/combobox_drop.png


BIN
IDE/Contents/Resources/UIThemes/dark/menu_bg.png


BIN
IDE/Contents/Resources/UIThemes/dark/menu_selector.png


BIN
IDE/Contents/Resources/UIThemes/dark/projectIcon.png


BIN
IDE/Contents/Resources/UIThemes/dark/templateIcon.png


BIN
IDE/Contents/Resources/UIThemes/dark/textfield_multi.png


Некоторые файлы не были показаны из-за большого количества измененных файлов