SamGondelman
283c0c0311
s i m p l i f y
2018-08-23 11:47:56 -07:00
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -07:00
SamGondelman
bd4a3a5b32
remove unused uniform buffer from polylines
2018-08-09 12:20:36 -07:00
Brad Davis
ae8f841912
Shader refactoring for explicit bindings
2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23
Moving to cmake time shader compiling
2018-08-03 14:58:11 -07:00
SamGondelman
16ad9cb5d3
xcolor/rgbcolor conversion
2018-07-11 18:06:06 -07:00
SamGondelman
9929529f30
vec3 conversion
2018-07-11 14:18:22 -07:00
SamGondelman
86ee5c12d8
merge and update based on sam's changes
2018-05-31 17:53:36 -07:00
SamGondelman
e6741a363e
add local-only isVisibleInSecondaryCamera flag to entities
2018-05-23 16:35:21 -07:00
samcake
767e6b15f3
Fixing the local lighting on translucents bug
2018-05-03 11:42:06 -07:00
humbletim
6ea4b660b7
CR feedback; remove ok bool pointer and all metadata; cleanup
2018-02-23 07:47:39 -05:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
Olivier Prat
92279b5939
Merged with master
2018-02-05 18:24:05 +01:00
humbletim
06afaa7470
BufferView <-> QVariant/QScriptValue conversion
...
update MeshProxy/SimpleMeshProxy and ScriptableModel
ModelScriptingInterface / scriptable::ModelProvider
integration
update to RC-63
initial graphics-scripting refactoring
graphics-scripting baseline commit
wip commit
Geometry -> MeshPart
remove SimpleMeshProxy
collapse graphics-utils -> graphics-scripting
scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
samcake
8dfa3aace3
cleaning en route
2018-01-26 17:34:37 -08:00
Olivier Prat
95882e0cde
Merged with master
2018-01-24 10:51:54 +01:00
Olivier Prat
49549ced17
Fixed compilation with new shader system
2018-01-17 10:52:58 +01:00
Olivier Prat
3911ce59cc
Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code
2018-01-16 19:02:12 +01:00
Sam Gateau
d6e771f01d
Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid
2018-01-13 10:02:53 -08:00
Olivier Prat
814de4ab81
Scribe now outputs shaders as cpp files.
2018-01-12 11:59:19 +01:00
SamGondelman
e9d751fd23
try to avoid reusing uniform buffer locations
2018-01-10 17:01:01 -08:00
Olivier Prat
bd666406f4
Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends
2017-12-19 14:17:17 +01:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Daniela
1d6985a9eb
Fix Animation hue bug.
2017-10-03 15:25:54 +01:00
Daniela
179a426389
Address QA comments.
2017-09-26 17:44:46 +01:00
Daniela
1426e10024
Fix texture loading issue with upstream master. Tune amount of points.
2017-09-19 17:47:00 +01:00
Brad Davis
aef85eb69d
Fix polyline rendering using default texture
2017-09-14 10:48:14 -07:00
Brad Davis
501eee8b10
Fix transform of polylines with high update rates
2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b
Fix polyline crash and flicker
2017-09-14 08:45:36 -07:00
Daniela
608e4858fc
Add Fix polyline crash and flicker
2017-09-06 19:06:05 +01:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Artur Gomes
482924266c
Fix brush texture stretching at start.
...
Add some code refactoring.
2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d
Add hue, saturation and brightness dynamic brushes.
...
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
2017-08-16 18:35:15 +01:00
Artur Gomes
03b70ed492
Do not test!
...
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
2017-08-16 18:32:17 +01:00
Artur Gomes
5c40a6810e
Add drawing in Desktop mode.
...
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be
Add new Interface (more similar to the ui used on other apps)
...
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
2017-08-16 18:28:55 +01:00
Delanir
0a97cfd736
Change UVMode updateGeometry Function
2017-08-16 18:25:01 +01:00
Delanir
ed5515a2d4
Add new Property to polyline to enable different uv modes. 2
2017-08-16 18:25:00 +01:00
Olivier Prat
e85bb6fd08
Fixed compilation warnings on Mac
2017-07-31 19:19:00 +02:00
Olivier Prat
5f1d45d4de
Revert "Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines"
...
This reverts commit 8a2fd01e81
2017-07-31 18:06:51 +02:00
Olivier Prat
8a2fd01e81
Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines
2017-07-31 15:31:37 +02:00
Olivier Prat
027c82c341
Removed fade transition on polyline entities.
2017-07-31 12:44:23 +02:00
Olivier Prat
a50c267d0b
Fading on polyline now works when the polyline is added to the scene
2017-07-20 12:45:14 +02:00
Olivier Prat
b652d94a43
Added fade on poly line entities
2017-07-19 17:11:06 +02:00
Olivier Prat
0319a16e24
Modified PolyLines to use the new custom pipeline system
2017-07-19 16:40:20 +02:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
samcake
9c1e99fe3f
Removing cruft and organizing the stencil config
2017-06-01 13:06:22 -07:00
