746 commits

Author	SHA1	Message	Date
Nelsson Huotari	69083369f8	use std::fill instead of for	2019-10-22 21:26:55 +03:00
Nelsson Huotari	dc7dc93320	Remove unused functions, improve formatting, handle terrain edit click	2019-10-22 21:26:55 +03:00
Nelsson Huotari	55b3fd4418	Use float calculations for circle brush, keep tool options in memory.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	23e7c71a5a	Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	8f3c22ccc3	Remove TerrainShapeMode::fixEdges	2019-10-22 21:25:10 +03:00
Nelsson Huotari	1a3fc435b9	Fix alterHeight bugs, don't let broken land edit pass.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	ff18595a86	Reduce code duplification, add bool value to limiting	2019-10-22 21:25:10 +03:00
Nelsson Huotari	60c0a25004	Fix smooth tool and flatten tool. Default tool strength to 8.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	54e13954e8	Improve land steepness limiting code	2019-10-22 21:25:10 +03:00
Nelsson Huotari	4a2d8aaf97	Handle mBrushSize 1.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	16138fc896	Transient land shape editing	2019-10-22 21:25:10 +03:00
Nelsson Huotari	78f2a5181d	Default brush size to 1	2019-10-10 14:27:22 +03:00
Nelsson Huotari	301c05662b	assignment to memb. init. list, publics to private, virtual -> final	2019-10-10 14:27:22 +03:00
Nelsson Huotari	4ccb951126	move check to outermost scope	2019-09-10 12:15:19 +03:00
Nelsson Huotari	0880923189	Consistency for variable and header argument names.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	6dc3d8b44b	More readable code	2019-09-10 12:15:19 +03:00
Nelsson Huotari	780055899d	Don't add empty primitive sets to geometry.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	3becacf6d1	Remove globals, const int& -> int, values to const ref.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	1dcee833a1	Less verbose syntax	2019-09-10 12:15:19 +03:00
Nelsson Huotari	5a143fe99d	Remove extra include	2019-09-10 12:15:19 +03:00
Nelsson Huotari	39ab449431	Only allow selection of cells in view	2019-09-10 12:15:19 +03:00
Nelsson Huotari	dc8de6c6e6	Make less copies	2019-09-10 12:15:19 +03:00
Nelsson Huotari	001ca68cc7	Remove empty lines	2019-09-10 12:15:19 +03:00
Nelsson Huotari	46ee639892	pass by const ref and other fixes	2019-09-10 12:15:19 +03:00
Nelsson Huotari	20ab7df19f	Fixes, cleanup.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	1a08944a8b	Remove unused code, clarifications, optimizations	2019-09-10 12:15:19 +03:00
Nelsson Huotari	d6722c7492	Terrain texture selection, support for vertex selection	2019-09-10 12:15:19 +03:00
Nat Meo	af1e5e01b4	Issue #5005: Instance window via Scene window	2019-07-01 23:26:05 +00:00
Capostrophic	85e99182ce	Revise light source configuration (bug #4965) ... Set up attenuation less awkwardly Use global attenuation settings for magic light source Use constant attenuation settings	2019-04-10 22:31:31 +03:00
Andrei Kortunov	a302ec9c65	Make fallback map static to simplify constructors	2019-03-29 15:30:49 +04:00
elsid	ccb325c663	Add override to fix warnings	2019-03-20 00:19:26 +03:00
Nelsson Huotari	2b674cedaa	Implement view cell from r-type hint	2019-03-16 14:38:51 +02:00
Andrei Kortunov	9e4a339ad3	Daytime node switch support (feature #4836)	2019-02-02 10:50:15 +04:00
Stomy	71be4cdd20	Ensure Unique Instance Refnum after clone, add, or move	2019-01-21 19:30:11 +00:00
mp3butcher	9de6c630f2	fix moc achieving to reach unparsable boost code	2018-12-01 21:27:43 +01:00
Andrei Kortunov	059a8fd32a	Refactor dynamic casts in the editor	2018-11-15 17:50:23 +04:00
Andrei Kortunov	5ac81cfbff	Throw exceptions with some info int the editor if dynamic_cast failed	2018-11-14 15:53:43 +04:00
Andrei Kortunov	4ee15ddcb9	Fix many Coverity Scan warnings	2018-11-14 11:21:49 +04:00
Andrei Kortunov	e06f0b797a	Replace all NULLs to nullptr	2018-10-09 10:21:12 +04:00
Capostrophic	03788edd63	Fix redundant drag call in instance dragging (bug #4593)	2018-10-05 18:48:17 +03:00
Kyle Cooley	0096951f25	cleanup	2018-09-27 13:14:59 +04:00
Kyle Cooley	676fc48855	Re-add logic for empty model	2018-09-27 13:14:59 +04:00
Kyle Cooley	f43b70d77b	Centralize actor data, simplify logic	2018-09-27 13:14:59 +04:00
Kyle Cooley	031502b2ab	Reorganize ActorAdapter data, use weak cache for sharing	2018-09-27 13:14:59 +04:00
Kyle Cooley	2a9ebac572	Simplify update logic, update when race parts are changed.	2018-09-27 13:14:59 +04:00
Kyle Cooley	1276e0fa9b	Handle changes to race record when rendering actors	2018-09-27 13:14:59 +04:00
Kyle Cooley	6bece13a32	Use new Log class for error message	2018-09-27 13:14:59 +04:00
Kyle Cooley	97ac0a92dd	Move data handling out of rendering code, equip armor/clothes	2018-09-27 13:14:59 +04:00
Kyle Cooley	6b42f37918	Handle creatures too	2018-09-27 13:14:59 +04:00
Kyle Cooley	e2ac392a40	Move common stuff to scene util, fix errors with 1st person meshes	2018-09-27 13:14:59 +04:00
Kyle Cooley	8444ee9981	Start rendering npc's	2018-09-27 13:14:59 +04:00
Andrei Kortunov	ee4ca87352	Traverse child nodes of cell node in the editor (bug #4654)	2018-09-26 23:13:18 +04:00
Andrei Kortunov	70ed8fd1a9	Use constants instead of widely used magic numbers (task #4645)	2018-09-17 19:22:50 +04:00
Andrei Kortunov	c7a5548475	Use new logging system for editor	2018-08-14 20:01:09 +04:00
Andrei Kortunov	6ddf6eb885	Use editor markers for lights and creatures levelled lists	2018-07-15 17:25:18 +04:00
Andrei Kortunov	27a5da59ba	Fix MSVC warnings C4456	2018-07-10 11:29:39 +04:00
Andrei Kortunov	f4330cf057	Editor: limit FPS in 3D preview windows (feature #3641)	2018-07-02 12:20:34 +04:00
Nelsson Huotari	825c331764	Remove texture filtering, better ltex importing, reindexing duplicates	2018-05-22 14:55:09 +03:00
Nelsson Huotari	8ae46519cf	Fix missed worldspacehits, add linebreak to tooltip	2018-05-20 21:58:40 +03:00
Nelsson Huotari	21e8d08e69	Handle invalid texture id's	2018-05-20 21:20:40 +03:00
Nelsson Huotari	17e01ca336	Setting "Scene Drops" rename "3D Scene Editing"	2018-05-16 11:41:37 +03:00
Nelsson Huotari	758ccac75a	Show texture id + filename	2018-05-16 11:34:58 +03:00
Nelsson Huotari	1c79d5311c	Brush history menu	2018-05-10 21:58:36 +03:00
Nelsson Huotari	62066f01bd	clean-up	2018-05-10 11:18:54 +03:00
Nelsson Huotari	d33c98c68d	Revert unintended changes	2018-05-10 11:18:54 +03:00
Nelsson Huotari	5656745445	Select dragged texture-assets, add brush settings widget-type, fixes.	2018-05-10 11:18:54 +03:00
Nelsson Huotari	baa707b5e3	User setting for selective cell editing or new land creation	2018-05-10 11:18:54 +03:00
Nelsson Huotari	24977fcc0f	improve hit calculation accuracy for texture editing	2018-05-10 11:18:54 +03:00
Nelsson Huotari	e8a9bff85c	Drop textures to landtextures from assets (try-method)	2018-05-10 11:18:54 +03:00
Nelsson Huotari	7139889566	Brush button window opens at modebutton, slider 1-50, doxygen comments	2018-05-10 11:18:54 +03:00
Nelsson Huotari	20d1d8ac89	Fixed brush calculations, implement undostack macro when clicked.	2018-05-10 11:18:54 +03:00
Nelsson Huotari	5f3c8b2b99	c_str -> fromStdString, remove TextureBrushButton class	2018-05-10 11:18:54 +03:00
Nelsson Huotari	cf7a0f715e	Command macro for complete drag-editing operations.	2018-05-10 11:18:54 +03:00
Nelsson Huotari	9f742d5b1f	Brush affects adjancent cells	2018-05-10 11:18:54 +03:00
Nelsson Huotari	1ca2710a2a	Formatting, fixes	2018-05-10 11:18:54 +03:00
Nelsson Huotari	1c113eca9c	15 to landTextureSize-1	2018-05-10 11:18:54 +03:00
Nelsson Huotari	3327d6f7c4	Drag terrain painting, code cleanup	2018-05-10 11:18:54 +03:00
Nelsson Huotari	a54a1b9940	Command system and undo	2018-05-10 11:18:54 +03:00
Nelsson Huotari	cc415526b0	fix texture index +1, better icons	2018-05-10 11:18:54 +03:00
Nelsson Huotari	316d05bdc4	{} to ()	2018-05-10 11:18:54 +03:00
Nelsson Huotari	4649d1258c	Direct data terrain editing	2018-05-10 11:18:54 +03:00
Nelsson Huotari	4ae75d1d20	Terrain texture brush frame	2018-05-10 11:18:54 +03:00
Nelsson Huotari	69aacdff17	Lamoot's new icon set	2018-04-15 12:35:45 +03:00
Miloslav Číž	1f5feeddb9	CS: Change camera parameter types to int	2017-12-15 14:46:23 +01:00
Miloslav Číž	f2777f7242	CS: Mover object-marker-alpha under Rendering	2017-12-15 14:36:12 +01:00
Miloslav Číž	79527b746a	Remove unused variable	2017-12-14 17:29:24 +01:00
Miloslav Číž	b246580c63	Fix orbit camera axis	2017-12-13 20:08:38 +01:00
Miloslav Číž	e309dfd234	CS: Rename variables (AppVeyor fix)	2017-12-08 22:06:03 +01:00
Miloslav Číž	199e41833f	Merge branch 'master' into cs-cam	2017-12-08 20:56:05 +01:00
Miloslav Číž	d85f8deaa3	CS: Add fixed roll setting, plus ortho fix	2017-12-08 20:51:40 +01:00
Miloslav Číž	1b77e3ed62	CS: Add ortho camera setting	2017-12-08 18:18:27 +01:00
Miloslav Číž	bfad5ebde4	CS: Fix camera orbit control with keys	2017-12-08 17:42:20 +01:00
Miloslav Číž	5e076ee015	CS: Fix camera orbit with arbitrary roll	2017-12-08 00:19:05 +01:00
Miloslav Číž	cfdc6c788e	CS: Make camera FOV change dynamically	2017-12-08 00:05:50 +01:00
Miloslav Číž	7d36dd68dc	CS: Make orbit camera not change roll	2017-12-07 23:52:05 +01:00
Miloslav Číž	360d786ff2	CS: Add rendering prefs and camera FOV	2017-12-07 23:48:34 +01:00
Kyle Cooley	eb23367175	Fix rendering depth/order issues	2017-11-26 17:39:57 -05:00
Kyle Cooley	c8f79ea838	Adjust rotation markers	2017-11-25 20:46:14 -05:00
Kyle Cooley	1cd539bad2	Fix render order for markers	2017-11-10 02:06:06 -05:00
Kyle Cooley	556117f6e6	Update marker transparency when changed.	2017-11-10 01:56:06 -05:00
Kyle Cooley	de214db8d4	Use configured transparency.	2017-11-09 13:45:32 -05:00
Kyle Cooley	197ea95646	Prevent arrows for move/scale markers from intersecting.	2017-11-09 13:04:46 -05:00
Kyle Cooley	492b99b008	Transparent object markers	2017-11-07 00:41:27 -05:00
Kyle Cooley	25d4a0370f	Changes to land data access in tables, also update Land once per frame in scene view.	2017-09-09 15:37:52 -04:00
Kyle Cooley	d030b595f8	Fix potential segfault, cleanup, get rid of warnings.	2017-09-09 11:48:13 -04:00
Kyle Cooley	2eacc2f093	Changes to land creation, add ability to specifically clear terrain cache	2017-09-08 14:37:03 -04:00
Kyle Cooley	ab607f3028	Tweaks to land loading, land cloning, terrain signals, placeholder land update handling	2017-09-08 00:51:46 -04:00
Kyle Cooley	d3014cf394	Temporary fix for adding new lands, cloned lands will still reference old data though	2017-09-04 15:13:45 -04:00
scrawl	4fba157d3b	Implement releaseGLObjects for cached resources	2017-08-26 19:29:12 +00:00
Kyle Cooley	42b948dffe	Fix pathgrid segfault	2017-08-23 11:35:26 -04:00
Kyle Cooley	d3d04171f9	Fix seg fault, undo changes BsaArchive	2017-08-22 15:06:56 -04:00
Kyle Cooley	979b0d7211	Code cleanup and more cache clearing	2017-08-21 18:58:38 -04:00
Kyle Cooley	3b9326d238	Clear terrain cache and reload terrain	2017-08-20 22:34:41 -04:00
Kyle Cooley	d4a722067d	Reload water	2017-08-20 20:55:56 -04:00
Kyle Cooley	5950b26912	Update scene assets	2017-08-19 19:36:45 -04:00
Kyle Cooley	249c1ae95a	Fix orbit camera jumping back to old position	2017-08-13 19:26:32 -04:00
Bret Curtis	d48b829b45	replace and purge boost::lexical_cast	2017-06-09 19:08:53 +02:00
Bret Curtis	39185e6f8c	purge the rest of boost::shared and any other boost related things that no longer are required ... put boost system back in, clean others up revert Qt add back boost fstream	2017-06-09 19:08:53 +02:00
Ewan Higgs	38a2de3c51	convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis	2017-06-09 16:49:25 +02:00
Rob Cutmore	0ff56677f6	Remove unused code	2017-04-06 19:56:18 -04:00
Rob Cutmore	84bad9316d	Editor: flag orbit camera for re-initialization ... After swapping cells the orbit cam controller needs to be re-initialized to properly center on the new cell.	2017-04-06 19:40:26 -04:00
Rob Cutmore	f7664d4bb9	Editor: reset camera after cell drag and drop ... When replacing a viewed cell via drag and drop the camera position is not updated to better view the new cell. This flags the camera position as not being set so a better default is set.	2017-04-04 18:54:58 -04:00
scrawl	6a745cb2cc	Fix text colorMode (Bug #3815) and render bin	2017-03-29 07:10:55 +02:00
scrawl	14225a42c6	Remove unused pointer to IncrementalCompileOperation	2017-03-14 19:27:55 +01:00
scrawl	5eff286c71	Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.	2017-03-14 19:27:55 +01:00
scrawl	5fb854036d	Use a forward declaration to avoid having to workaround Qt MOC ... Don't think that guard was still needed, but a forward declaration is better anyways.	2017-03-14 19:27:55 +01:00
scrawl	80a0398f9d	Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads	2017-03-14 19:27:55 +01:00
scrawl	35d53acc65	Factor out terrain chunk loading/caching into a new resource manager	2017-03-14 19:27:55 +01:00
scrawl	9a3a64f0c4	Add resource manager for ESM::Land to allow data to be unloaded when no longer required	2017-03-14 19:27:55 +01:00
scrawl	625c5040ce	Fix build	2017-02-01 15:49:20 +01:00
scrawl	960d4a96c3	Reduce the number of osg::Material state by setting the default state on the graph root	2017-02-01 06:00:14 +01:00
Leon Krieg	c7b4b2cdd7	Fixed multiple spelling mistakes	2016-12-14 16:39:33 +01:00
Allofich	ccacad51be	Fix shadowing warnings	2016-10-16 01:34:54 +09:00
Allofich	1c54f54ab8	Fix shadowing warnings	2016-10-15 00:12:46 +09:00
scrawl	95a67bf0c2	Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads ... Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158	2016-10-10 18:23:06 +02:00
Aesylwinn	ee432690e6	Make it easier to place objects in the scene editor. ... This fix allows objects to be dropped onto the ground, and prevents objects from being selected through the ground.	2016-09-03 17:37:13 -04:00
Marc Zinnschlag	316cf40f12	Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'	2016-09-01 11:51:34 +02:00
Aesylwinn	c0d53a2557	Fix CellRefs being teleported from interior to exterior cells.	2016-08-31 11:02:04 -04:00
Aesylwinn	91fd966146	Fix some issues detected by coverity for the editor.	2016-08-18 12:42:35 -04:00
Marc Zinnschlag	2fef8948f1	Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'	2016-08-18 09:13:43 +02:00
Aesylwinn	7125775648	Change free axis rotation.	2016-08-15 15:07:43 -04:00
Aesylwinn	3e4ac0c662	Potential fix for context sensitive select mode issues.	2016-08-14 14:43:29 -04:00
scrawl	2f6075329b	Clang warning fixes	2016-08-14 15:10:50 +02:00
Aesylwinn	101c3cc90d	Rotate around center of selection.	2016-08-12 17:12:10 -04:00
Aesylwinn	571969cd65	Scale from center of selection.	2016-08-12 17:11:37 -04:00
Aesylwinn	388917df89	Base editor rotate/scale commit.	2016-08-10 19:31:34 -04:00
Aesylwinn	0963adb2f4	Fix pointer being deleted twice.	2016-08-08 14:36:50 -04:00
Aesylwinn	16d0580ce8	Fix struct/class mismatch.	2016-08-05 15:39:08 -04:00
Aesylwinn	1f32f1eef5	Add water texture.	2016-08-05 14:55:40 -04:00
Aesylwinn	9454f4f2e7	Use shared water geometry + state generation, ... Fix water position and render bin, Fix passed cell parameter being ignored	2016-08-05 13:49:44 -04:00