ZappoMan
|
1fec69698e
|
get the triangle picking for submeshes working, remove some debug
|
2014-12-05 23:23:21 -08:00 |
|
ZappoMan
|
f1c6e2d1a2
|
more debugging
|
2014-12-05 19:52:48 -08:00 |
|
ZappoMan
|
ae647d39d0
|
fix models with registrations other than 0,0,0
|
2014-12-05 16:14:18 -08:00 |
|
ZappoMan
|
d5fbe5b6b4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick
|
2014-12-05 12:48:00 -08:00 |
|
ZappoMan
|
a6b86da47a
|
basics of triangle picking working for models
|
2014-12-05 11:31:27 -08:00 |
|
ZappoMan
|
0647211fb8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick
|
2014-12-05 10:13:55 -08:00 |
|
ZappoMan
|
d3aacc3838
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest
Conflicts:
interface/src/MetavoxelSystem.cpp
|
2014-12-05 10:11:49 -08:00 |
|
Philip Rosedale
|
0ad361fd60
|
Merge pull request #3902 from samcake/tot
Adding detection of a "hifi" global light in a FBX file used to pass information
|
2014-12-05 10:07:52 -08:00 |
|
ZappoMan
|
e68e3fe774
|
Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"
This reverts commit 6d385d9a75 .
|
2014-12-05 10:06:17 -08:00 |
|
ZappoMan
|
9753c82a3b
|
get rid of redundant _displayViewFrustum and use _viewFrustum
|
2014-12-05 10:04:23 -08:00 |
|
ZappoMan
|
feab942375
|
Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"
This reverts commit 6d385d9a75 .
|
2014-12-05 10:01:16 -08:00 |
|
ZappoMan
|
6b5fdceb6e
|
more work on improved model picking
|
2014-12-04 16:48:04 -08:00 |
|
ZappoMan
|
37ffa48fa3
|
more work on improved model picking
|
2014-12-04 16:43:12 -08:00 |
|
Sam Gateau
|
f4e1af6abc
|
clean code in GeometryCache around the FBX file loader
|
2014-12-04 12:02:30 -08:00 |
|
ZappoMan
|
b6fd3628c8
|
first round of hacking on implementing rendering of models for detailed ray picking
|
2014-12-04 12:00:38 -08:00 |
|
Sam Gateau
|
913007939b
|
Trying to read the light attribute
|
2014-12-03 14:12:50 -08:00 |
|
ZappoMan
|
5f9c1c490b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
|
2014-12-03 10:44:56 -08:00 |
|
Sam Gateau
|
40df497374
|
Hack for the Viking Palace scene before demo for good looking lightmaps
|
2014-12-02 13:48:59 -08:00 |
|
ZappoMan
|
6d385d9a75
|
get rid of redundant _displayViewFrustum and use _viewFrustum
|
2014-12-02 11:45:33 -08:00 |
|
Sam Gateau
|
845e687fc5
|
Adding a Hack for the apaartment model to boost the lightmaps
|
2014-12-01 11:45:07 -08:00 |
|
Philip Rosedale
|
e44ca5a7f7
|
Merge pull request #3876 from ZappoMan/bugFixes
fixes the stutter in animation when observer moves
|
2014-11-30 18:44:21 -08:00 |
|
Sam Gateau
|
321d651d77
|
Hack for avoiding lightmaps loading in starchamber
|
2014-11-30 12:54:43 -08:00 |
|
ZappoMan
|
5c2cc20313
|
fixes the stutter in animation when observer moves
|
2014-11-28 17:36:55 -08:00 |
|
Sam Gateau
|
c78af1c982
|
fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why
|
2014-11-27 10:48:36 -08:00 |
|
Sam Gateau
|
77077f4e9c
|
hack a separate emissive information in the g-buffer
|
2014-11-25 18:17:28 -08:00 |
|
dev
|
ce103acdf6
|
More debugging of the FBXReader in order to understand how to interpret the material fields
|
2014-11-24 18:32:36 -08:00 |
|
Sam Gateau
|
6a63099a0f
|
Fixed syntax issues and review critics, put all the debugging code in a #define block
|
2014-11-24 15:24:20 -08:00 |
|
Sam Gateau
|
68e2df8fc2
|
add a emissive parameter value to the lightmap shaders
|
2014-11-24 14:35:42 -08:00 |
|
Sam Gateau
|
f67b4b9ff4
|
clean out comments so the 2 rendering modes for entities work, scene batch or per model batch
|
2014-11-24 11:44:54 -08:00 |
|
Sam Gateau
|
1f22d5b493
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
|
2014-11-24 10:05:39 -08:00 |
|
Sam Gateau
|
87471df7a1
|
First version of the lighmap working
|
2014-11-21 18:08:34 -08:00 |
|
Andrzej Kapolka
|
da85714dc8
|
Batch heightfield sections for better performance.
|
2014-11-20 15:09:38 -08:00 |
|
Sam Gateau
|
7daff18101
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
|
2014-11-20 09:57:59 -08:00 |
|
Sam Gateau
|
764ad72471
|
adding the light map support from FBX
|
2014-11-20 09:54:41 -08:00 |
|
Atlante45
|
ae3bcc8f06
|
No more .f
|
2014-11-19 16:53:39 -08:00 |
|
Sam Gateau
|
4f878682a9
|
fix syntax
|
2014-11-14 12:38:50 -08:00 |
|
Sam Gateau
|
d9ae3eb5b6
|
clean version of the simple stereo ack, not available for Occulus yet
|
2014-11-14 12:07:59 -08:00 |
|
Sam Gateau
|
f09b58c255
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-14 10:05:01 -08:00 |
|
Sam Gateau
|
642f436fba
|
first draft of factorizing the rendering traversal for both sides in stereo
|
2014-11-14 09:56:36 -08:00 |
|
ZappoMan
|
6a4f1c857f
|
fix a couple bugs
|
2014-11-13 18:35:04 -08:00 |
|
ZappoMan
|
49ef6f8be0
|
some cleanup
|
2014-11-13 14:53:37 -08:00 |
|
ZappoMan
|
3ff89be3fd
|
actually only pick programs once
|
2014-11-13 14:51:47 -08:00 |
|
ZappoMan
|
d7d7db4494
|
Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering
|
2014-11-13 14:47:15 -08:00 |
|
ZappoMan
|
7ba3c74bc0
|
more work on render model scenes
|
2014-11-13 14:47:02 -08:00 |
|
Sam Gateau
|
420118e9db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-13 11:04:12 -08:00 |
|
Sam Gateau
|
7e2c4c0561
|
SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint
|
2014-11-13 10:57:32 -08:00 |
|
ZappoMan
|
4077f6c2ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification
|
2014-11-12 20:39:39 -08:00 |
|
ZappoMan
|
63a8608ac6
|
handle per model transforms, default scene mode off
|
2014-11-12 20:20:36 -08:00 |
|
ZappoMan
|
13f08e65d1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering
Conflicts:
interface/src/renderer/Model.h
|
2014-11-12 19:31:27 -08:00 |
|
Sam Gateau
|
8fb04af59d
|
defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design
|
2014-11-12 16:40:45 -08:00 |
|