Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 16:56:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38535 commits 74 branches 59 tags 1.2 GiB
Commit graph

269 commits

Author SHA1 Message Date
Zach Pomerantz
82f7ea515d Clean up task construction 2016-01-14 12:49:42 -08:00
samcake
0285d48de3 Exposing many more controls of the AO in order to adjust the effect 2016-01-13 18:57:47 -08:00
Zach Pomerantz
5c9c34377e Move GL context sync to render Engine (from Task) 2016-01-13 17:53:15 -08:00
Zach Pomerantz
ee69d8f817 Fix bitsetters for ShapeKey::Builder 2016-01-13 17:44:01 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
samcake
89d2d102f6 exposing the ditheringEnable field 2016-01-12 18:51:30 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
c9e1d8f5f4 Set up pipelinelib correctly (use filters insig bits) 2016-01-11 20:17:52 -08:00
Zach Pomerantz
db91b12203 Refine addPipeline signature to be more explicit 2016-01-11 17:31:19 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Zach Pomerantz
4ff2b85e1a Replace ShapePipelineLib abstract with ShapePlumber instanced class 2016-01-11 16:00:08 -08:00
samcake
38e9d2281d Merging with master 2016-01-11 15:49:16 -08:00
Zach Pomerantz
407c1bc626 Handle out-of-range in render::FetchItems 2016-01-08 20:16:08 -08:00
Zach Pomerantz
bf68f2f2fa Templatize item culling 2016-01-08 20:11:52 -08:00
Zach Pomerantz
695c69fd34 Conform to coding standards 2016-01-07 14:26:59 -08:00
Zach Pomerantz
c19b457401 Forward arguments and mark T::JobModel as dependent name 2016-01-07 14:15:01 -08:00
Zach Pomerantz
e809c4f89d Avoid copying Item before rendering 2016-01-07 13:42:56 -08:00
Zach Pomerantz
1b3e144395 Rename Shape to ShapePipelineLib, Shape.h to ShapePipeline.h 2016-01-07 13:29:35 -08:00
Zach Pomerantz
39269f12ec Clean and fix Wreorder 2016-01-07 11:40:01 -08:00
Zach Pomerantz
0f6d9a4db6 Use variadic for addJob for cleaner construction 2016-01-07 11:40:00 -08:00
Zach Pomerantz
f902c4078d Clean old DrawSceneTask 2016-01-06 18:55:14 -08:00
Zach Pomerantz
9b4a395f6b Promote render::Job to render::Task::Job 2016-01-06 18:55:13 -08:00
Zach Pomerantz
bcb01feb94 Merge branch 'render-shape' of http://github.com/Atlante45/hifi into feat/render-shape 2016-01-06 11:46:16 -08:00
Atlante45
b68572fdd0 Cleanup renderShapes render loop 2016-01-06 11:43:17 -08:00
Zach Pomerantz
9bc661adc8 Cleanup for style/dead code 2016-01-06 11:42:58 -08:00
samcake
7e2cf741c0 Clen up, exposingthe level of obscurance 2016-01-06 13:16:16 -04:00
Zach Pomerantz
da50eacaad Resolve Hash const function and include per Jenkins 2016-01-05 18:08:28 -08:00
Zach Pomerantz
948dc26d24 Add debug statement for invalid ShapeKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
4eff377258 Change Slots->Slot to be congruous with gpu 2016-01-05 17:20:08 -08:00
Zach Pomerantz
258a414404 Add ShapeKey::NO_PIPELINE for shapes without Shape::Pipeline 2016-01-05 17:20:08 -08:00
Zach Pomerantz
df54d1dcc9 Fix render::Shape::Pipeline ownership by storing shared_ptr in map 2016-01-05 17:20:08 -08:00
Zach Pomerantz
ad329a9331 Return nullptr if no pipeline is found 2016-01-05 17:20:08 -08:00
Zach Pomerantz
63444aac72 Back to shapeContext, compiling 2016-01-05 17:20:08 -08:00
Zach Pomerantz
cf35974f02 Move shapeContext to jobContext 2016-01-05 17:20:08 -08:00
Zach Pomerantz
dfcb74c3be Split renderItems to Lights/Shapes 2016-01-05 17:20:08 -08:00
Zach Pomerantz
7913ca7f3b Render using ShapeRender, pickPipeline in renderItems 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c0800abdc5 Add virtual ~Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
e96b1fa881 Return copies of local vars in Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
74c4930034 Remove DrawBackround task 2016-01-05 17:20:08 -08:00
Zach Pomerantz
1a3a9be605 Use PipelinePointer for rendering Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
59a354ea8c Change payload interface to return ShapeKey, not MaterialKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
16bb861046 Add render::Shape to abstract ModelRender 2016-01-05 17:20:08 -08:00
samcake
52f3c7e2cb Introducing the sl files and the blurring stages 2016-01-02 11:27:50 -04:00
Zach Pomerantz
df78f895a6 Reorder RenderContext initializer to avoid -Wreorder 2015-12-22 14:54:47 -08:00
Zach Pomerantz
d8022aa5b0 Add back deferred debugging and combine context init 2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d Nest JS props in RenderScriptingInterface 2015-12-21 14:32:06 -08:00
samcake
f24800cf10 Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script 2015-12-18 15:35:01 -08:00
Zach Pomerantz
674bfa4f37 Replace RenderContext substructs with subclasses 2015-12-18 12:04:21 -08:00
Zach Pomerantz
d057239023 Rename RenderContext::ItemsMeta to ItemsConfig 2015-12-18 11:48:40 -08:00
Zach Pomerantz
cdcb2d565d Use new RenderContext accessors for rendering 2015-12-18 10:34:39 -08:00
Zach Pomerantz
919a4b6728 Split global JS Scene into Render 2015-12-18 10:33:41 -08:00
samcake
1b1365fd40 Exposing the tone curve in the js api 2015-12-16 16:32:53 -08:00
samcake
1364329886 FIxing the compil bug by checking security of the call with assert and avoiding the compilation error 2015-12-15 22:07:06 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Atlante45
7472673dae More warning fixes 2015-12-11 17:23:12 -08:00
Atlante45
4bfa279b1b Merge branch 'warnings-win' of github.com:Atlante45/hifi into warnings-win 2015-12-11 17:02:57 -08:00
Atlante45
b7ba3c5f17 More warning fixes 2015-12-11 17:02:03 -08:00
Atlante45
79fdb2e882 Fix warnings on windows 64bit 2015-12-11 16:31:27 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
Atlante45
c27944ae28 Simple normal map debug 2015-12-04 10:44:23 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Seth Alves
3b6b56f316 formatting 2015-11-13 14:26:43 -08:00
Seth Alves
a366633f84 cleanups 2015-11-12 11:03:44 -08:00
Seth Alves
83d5c9cf4a arrange status icons in two rows of 4 each 2015-11-11 18:54:07 -08:00
Seth Alves
a16a477134 fix warning 2015-11-11 16:51:55 -08:00
Seth Alves
715a46ee82 show actions in status icons 2015-11-11 16:35:04 -08:00
Seth Alves
66387c4530 use icons to show network and physics status 2015-11-10 17:02:57 -08:00
Seth Alves
d043011a11 Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug 2015-11-10 10:16:02 -08:00
Seth Alves
8e466190e0 working toward display icons for debug/status display 2015-11-10 10:15:58 -08:00
Seth Alves
f3d26e163d turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system 2015-11-07 07:19:27 -08:00
Brad Hefta-Gaub
0b2bf8bda8 remove some dead code 2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
samcake
dc3c9b48ea MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Raffi Bedikian
59a758b5ec Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
Sam Gateau
730ad2da2f removing dead code 2015-08-04 16:37:01 -07:00
Sam Gateau
fc0ee28b84 FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD 2015-08-04 16:31:20 -07:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Sam Gateau
ab4b940d83 merge with upstream 2015-07-29 17:11:13 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
ericrius1
697cb4c9d0 fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
ZappoMan
c15161b71a fix crash in Particle Entities and pendingChanges.updateItem() 2015-07-28 14:56:38 -07:00