7fecdba313
Restored choice and toggles working on preview renderers
2013-11-30 18:06:41 +01:00
684a64158c
Fixed and refactored terrain preview
2013-11-30 11:54:27 +01:00
79080c756f
Removed old euclid.h/c
2013-11-20 17:09:55 +01:00
4c49e2e757
Removed unused OpenCL
2013-11-20 17:01:49 +01:00
7fd79672be
Refactored water previews
2013-11-20 13:06:16 +01:00
ee094d9b18
Refactored atmosphere previews
2013-11-20 11:27:21 +01:00
ee78af05d5
Refactored cloud previews
2013-11-19 23:46:37 +01:00
532685f7cb
Removed unused memory.h/c
2013-11-19 16:04:16 +01:00
8a42d7407a
Removed unused ColorGradation + removed old color.h/c
2013-11-19 12:59:06 +01:00
a108682b4d
Refactored ColorProfile
2013-11-19 12:51:26 +01:00
82defc96f6
Removed old tools.h/c
2013-11-19 12:16:33 +01:00
051766d1d5
Fixed top-down render preview in render form
2013-11-17 23:33:46 +01:00
6436428eeb
Removed UNUSED() macro and simplified some headers
2013-11-17 23:02:36 +01:00
0ae9fe94b2
Fixed atmosphere previews not using the correct camera
2013-11-17 22:51:06 +01:00
541f1e065f
Fixed layer names not being saved/loaded or copied
2013-11-17 22:47:27 +01:00
9e6838f733
TerrainDefinition and Scenery refactoring
2013-11-17 22:36:18 +01:00
fa5c0041af
Refactored TexturesDefinition, getting rid of legacy layers
2013-11-16 19:12:42 +01:00
5506158363
Fixed camera above ground checking in opengl renderer
2013-11-16 00:39:17 +01:00
4f9e24b87d
Refactored AtmosphereDefinition
2013-11-16 00:27:40 +01:00
1cccae90be
Refactored CloudsDefinition
2013-11-15 23:26:44 +01:00
dc679500fa
Renaming editing -> interface/desktop
2013-11-14 21:46:47 +01:00
c1fd52b0db
Ensure camera is above ground and water
2013-11-14 21:05:12 +01:00
2df3c90ffd
Refactored Matrix4 and CameraDefinition
2013-11-14 18:47:03 +01:00
67105775b6
The default scenery for a SoftwareRenderer is now a default scenery (not the global one)
2013-11-13 23:36:52 +01:00
cdd9ef26a2
Removed Scenery C-API and fixed some problems
2013-11-13 23:03:02 +01:00
5be3231ab9
Refactoring color
2013-11-13 20:07:35 +01:00
aed4f9d80e
Refactoring of BasePreview
2013-11-12 23:15:35 +01:00
d9f2f3878f
Big WIP refactoring (preview + atmosphere renderer)
2013-11-12 21:34:35 +01:00
dcc36990b7
Merge branch 'fluid_traversal'
2013-11-11 15:43:13 +01:00
f1a13516c9
Freeze and disable fluid medium traversal, for master merge of progress
2013-11-11 15:42:11 +01:00
5054d3583d
Refactored Vector3 to class
2013-11-11 13:56:39 +01:00
3652333b36
Removed old 'testing' directory
2013-11-10 21:21:55 +01:00
ea8f7f6fb1
Merge branch 'master' into fluid_traversal
...
Conflicts:
Makefile
2013-11-10 21:18:32 +01:00
0627603f5a
Using googletest instead of cppunit
2013-11-10 21:14:10 +01:00
4a39eda2dc
WIP on fluid medium traversal
2013-11-10 17:04:38 +01:00
8051719f9f
WIP on restoring unit tests on cppunit
2013-11-10 17:03:07 +01:00
0edd90c477
WIP on fluid medium traversal
2013-11-09 19:13:28 +01:00
6835db2aca
Small makefile correction
2013-11-09 19:00:14 +01:00
a48213453a
Ajout de common.pri
2013-11-09 18:56:56 +01:00
e9751a0e0b
WIP on fluid medium traversal
2013-11-09 18:46:34 +01:00
5c2bc4b31e
Refactoring for c++
2013-11-07 09:37:11 +01:00
cf75e86be6
Extracted opengl "explorer" in render/opengl library
2013-11-05 11:45:26 +01:00
b5c50d16d4
Made a class of NoiseGenerator
2013-11-03 15:46:39 +01:00
1a69b1de1d
Removed C-API from 'system'
2013-11-03 13:00:31 +01:00
abd463d29d
Switched rendering lib to c++ compiling
...
This will allow to avoid #if __cplusplus directives, and C-apis.
2013-11-02 16:43:43 +01:00
d2620ae2e3
Fixed problems with new c++ layers
2013-11-01 00:09:51 +01:00
ca0f87b419
Started adding cppunit tests
2013-10-31 22:53:22 +01:00
5dfa34dd56
WIP on c++ layers
2013-10-31 17:59:18 +01:00
8b9c3b2de1
Fixed some compilation issues
2013-10-30 15:39:56 +01:00
b789e3879d
Rewritten PackStream in C++, using Qt serialization
2013-10-30 12:46:18 +01:00
00cbc7f424
Fixed a problem with direct scenery access in C-API
2013-10-29 21:38:27 +01:00
ce56f0a985
New Scenery class, with transitional C-api
2013-10-29 21:28:59 +01:00
ea25cdaa55
Removed system.h and system.c (replaced by System class)
2013-10-26 23:19:49 +02:00
e82e0c47bd
Added win32 DLL support everywhere
...
Build is now entirely possible from a fresh QtSDK install,
with no external dependency.
2013-10-20 16:47:59 +02:00
6ab664485a
Win32 DLL support for libpaysages_system
2013-10-20 15:24:58 +02:00
ad1a492884
Removed dependency to GLib/GThread
2013-10-20 15:07:12 +02:00
25d14a43ce
Replaced glib mutex by QMutex
2013-10-20 15:01:57 +02:00
4ee1c4f7e1
Threading now uses QThread instead of glib threads
2013-10-20 14:53:53 +02:00
b896832e76
Removed dependency to OpenIL/libDevIL
2013-10-20 14:34:55 +02:00
5032f1b2aa
Correction des config qmake
2013-10-16 17:09:20 +02:00
46f34eb23c
Small cloud preview improvement
2013-10-08 10:13:51 +02:00
f4e4c1def4
Simplified qmake usage and normalized build between make and qtcreator
2013-10-06 23:04:04 +02:00
f39c4b3f6c
Temporary fix for preview renders stopping when window loses focus
2013-10-06 15:45:53 +02:00
29d258574a
Fixed terrain preview not clearing base texture zone
2013-10-03 23:31:23 +02:00
23cad30548
Started textures edition dialog (WIP)
2013-10-03 23:28:30 +02:00
a7bc90a1a1
Fixed compile warning (regarding static members initialization)
2013-10-03 23:28:09 +02:00
81a27b1b39
Tweaked textures presets
2013-10-03 23:27:37 +02:00
7ea28826bb
Fixed terrain preview not using specified material
2013-10-02 22:00:08 +02:00
7f0a13c02b
Zone height ranges can now be relative to terrain and water height
2013-09-27 23:28:06 +02:00
be19d1d759
Moved zone.h and zone.c to tools
2013-09-27 22:06:00 +02:00
8d701e910b
Small include fixes and unused variable tagging
2013-09-27 22:04:05 +02:00
f1e2c17f2e
Merge branch 'master' of ssh://bitbucket.org/thunderk/paysages
2013-09-26 22:12:34 +02:00
c6be386a59
Switch to HSL color space for material definition
2013-09-18 17:10:34 +02:00
05c0a58875
Separated texture layer results for previews
2013-08-28 16:03:22 +02:00
7cd74b2c8a
WIP on texture previews
2013-08-24 00:51:27 +02:00
2c79175304
Header chain optimization
2013-08-24 00:50:56 +02:00
4d8a1fe5cf
Fixed build system (now working from cli and qteditor)
2013-08-24 00:50:12 +02:00
02e839406c
Factorized common qmake parts
2013-08-23 22:57:34 +02:00
08d7b56f00
Switching all build system to qmake
2013-08-23 20:29:54 +02:00
c46afa4152
Added presets to FreeFormHelper + small fixes
2013-08-21 23:22:13 +02:00
171df529fa
Added layer coverage preview on new textures form
2013-08-21 23:19:47 +02:00
08b481df7d
WIP on new material dialog
2013-08-18 17:13:15 +02:00
bc3f47e3b9
Added rounded drawing widgets
2013-08-18 17:12:54 +02:00
f199963867
Several fixes and small changes
2013-08-17 18:08:37 +02:00
c8f36643d0
WIP on new texture form
...
- Added FreeLayerHelper
- Added texture layers table
2013-08-17 17:04:48 +02:00
0a11c7d48a
Small noise optimization
2013-08-17 15:11:49 +02:00
3acc0fe25d
Removed profiling from debug build
2013-08-17 15:11:21 +02:00
45646d47a2
More realistic material previews (more light power with HDR applied)
2013-08-17 15:10:17 +02:00
24a9145bb3
clouds: Precision fixes
2013-08-13 17:51:54 +02:00
330ac54ac9
clouds: Added edge density
2013-08-13 17:11:39 +02:00
595ac664c4
Water raster now uses ParallelQueue
2013-07-07 00:45:43 +02:00
e09b812869
Fix water raster offsetting with camera
2013-07-07 00:45:08 +02:00
2fe387918f
Terrain rasterizer now uses ParallelQueue to use cpu cores
2013-07-07 00:32:45 +02:00
9d13f46fe6
Made rasterization by scanlines thread-safe
...
renderPushTriangle can now be called concurrently
2013-07-07 00:32:01 +02:00
edde8442f5
Added parallelQueueWait
2013-07-07 00:30:26 +02:00
8c8fb185cd
Fixed parallel queue issues
2013-07-07 00:30:14 +02:00
ea24656b20
raster_threading: Added ParallelQueue system as helper
...
It will be used to push tessellated quads to render area.
2013-07-04 17:36:41 +02:00
e90c8be5a4
Increased rendering distance
2013-07-03 17:48:54 +02:00
d8695803b4
Added cloud walker subdivision system
2013-07-03 13:06:08 +02:00
651e3fc3b6
Clear terrain painting when applying presets ( fix #6 )
...
This fixes the bug where painted heightmap was not cleared
on new scene.
2013-06-27 17:11:37 +02:00
71d0eaacd0
Fixed render progress + added terrain raster progress
2013-06-27 12:15:30 +02:00
56b1a0d97f
Tweak the tessellation setting for faster renders
2013-06-27 12:03:55 +02:00
cbb4455ab5
Removed unused water_height parameter
2013-06-27 11:49:32 +02:00
390fa99bab
Tessellate terrain chunks at optimal level, using projected bounding box
2013-06-27 11:47:16 +02:00
3e42320c3f
Added bounding box system, with camera support
2013-06-27 11:46:18 +02:00
48494f9e18
terrain_tessellation: Started new tessellation system
2013-06-26 17:28:21 +02:00
039e4bb3cb
Started work on new textures interface
2013-06-23 22:54:57 +02:00
300f53121e
Todos update + make main window select first tab as start
2013-06-23 22:21:42 +02:00
08ada5fc7a
Fix pack compile problems caused by strlen
...
- Removed strlen usage
- Added unit testing to protect the change
- Fixed some bugs found with the unit test
2013-06-21 15:02:49 +02:00
88a2e90f8b
Fix some compile issues on windows
2013-06-21 15:01:39 +02:00
d5edffd55f
Fix compilation on controlling (missing header)
2013-06-21 12:36:05 +02:00
c49dec4331
Quick fix for big cloud lighting artifact
2013-06-20 23:47:40 +02:00
da27cc9b1e
Fix free form refreshing from global data update
2013-06-20 23:18:15 +02:00
3d7aefe79d
Fixed a wrong qt4 import
2013-06-20 22:22:05 +02:00
2021817082
Add "switch to textures" button on terrain page
2013-06-20 22:21:09 +02:00
62a956a65f
Add texture displacement info in terrain tab
2013-06-20 22:11:41 +02:00
ce4bddad4f
Polish of terrain tab (translations mostly)
2013-06-20 19:01:39 +02:00
87c428ea1a
Improve terrain brush settings in dialog
2013-06-20 17:56:15 +02:00
110d16e0b6
Remove unused features in terrain painting dialog
2013-06-20 17:45:26 +02:00
a76853c237
Added toggle for painted area display in terrain painting dialog
2013-06-20 17:38:23 +02:00
25a49f52d8
Added rendering tests for bruneton aerial paerspective
2013-06-20 12:33:18 +02:00
22a44540d9
Fixed a cache issue
2013-06-20 12:32:50 +02:00
d401d0105c
A little cleaning, and fixed some camera issues
2013-06-16 23:01:22 +02:00
5c21a548e3
Started work on debian package
2013-06-16 19:06:10 +02:00
356b1dad5b
Fixed hdr color mapping, broken in previous commit
...
It was broken in commit 6964e73cd745386ebf131ad0955ed2db590b12fe
2013-06-16 16:19:10 +02:00
d713447f54
Improved double display precision in unit tests
...
Now using a display precision better than compare precision
2013-06-16 16:12:30 +02:00
284b43362e
Merge branch 'fix_terrain_painting_scaling' into 'master'
2013-06-16 16:09:39 +02:00
4658db3cea
Fixed terrain paint brush 'smooth'
2013-06-16 16:06:46 +02:00
9b9ea22054
Fixed terrain paint brush 'reset'
...
- Taking scaling into account
- Added unit tests
2013-06-16 16:03:17 +02:00
2d866442e7
Improved previous tests readability
2013-06-16 15:30:56 +02:00
db51b3af81
Fixed terrain paint brush 'flatten'
...
- Now taking scaling into account
- Added unit tests on the brush
2013-06-16 15:23:37 +02:00
2c340f0e43
Added quick unit test for perspective correction
2013-06-14 13:39:45 +02:00
b793259554
Merged perspective_correction into master
2013-06-13 18:35:58 +02:00
48d9c131ad
Finally attained perspective correctness
2013-06-13 17:45:26 +02:00
c4cc784003
Adding small unit tests
2013-06-13 17:37:29 +02:00
5b2f437c35
More texture presets adjustments
2013-06-11 23:31:44 +02:00
1eb01133cf
Partially fixed black widget after render.
...
The containing scroll area still blacks out...
2013-06-11 18:09:14 +02:00
4033162040
More realistic texture presets
2013-06-11 18:00:59 +02:00
feb422cd11
Merge branch 'master' into perspective_correction
...
Conflicts:
src/testing/main.c
2013-06-11 17:35:53 +02:00
a02f82c13a
First attempt at perspective correction
...
We inverse the perspective transformation to interpolate the scanlines.
The perspective is corrected but there are still precision problems (straight lines are deformed).
2013-06-11 12:07:17 +02:00
1b890849a8
Added renderer to RenderArea to gain access to camera
2013-06-11 12:03:50 +02:00
a4ea010b86
Added unit testing for terrain grid
2013-06-09 23:03:37 +02:00
47de568004
Added scaling adjustements
...
This is not enough, there are still problems with painting brush offsets.
2013-06-09 23:03:16 +02:00
b15ea439d2
Started terrain base noise edition dialog
2013-06-09 19:36:30 +02:00
6707998a76
Hidden previous tool panel (delayed for future release)
2013-06-09 18:20:25 +02:00
d60a169751
Added terrain base noise preview + main window refactoring
2013-06-09 18:08:01 +02:00
06764427a6
Adapt to previous noise normalization fix
2013-06-09 15:11:03 +02:00
701faf6ece
Fixed noise range and normalization (with unit testing)
2013-06-09 14:56:45 +02:00
f3ddf1917f
Added data system to detect if run in good path
2013-06-09 14:07:45 +02:00
eb837ef3bd
Fixed terrain painting unwanted scrolling on show
2013-06-03 22:03:52 +02:00
41cc8787ac
Added sun inflation near horizon
2013-06-03 21:51:01 +02:00
6355de2e5e
Merge branch 'clouds_walking'
2013-06-02 21:50:16 +02:00
b6376deeca
clouds_walking: Restored cloud previews
2013-06-02 21:49:48 +02:00
632ed58c71
Added auto resize on previews
...
Currently only available on previews handled by FreeFormHelper
2013-06-02 19:24:26 +02:00
1ede3de8d5
clouds_walking: Started using walker in rendering
2013-06-02 12:36:05 +02:00
20dbe142f5
Fixed issues on rendering dialog
2013-06-01 17:10:00 +02:00
aefc3cacdd
Merge branch 'master' into clouds_walking
2013-06-01 16:56:14 +02:00
07e3f4a175
Fixed some unit tests check functions
2013-06-01 16:14:34 +02:00
94a2d9ccac
Merge branch 'master' into clouds_walking
2013-06-01 15:57:35 +02:00
d2874207f8
Fixed some unit tests check functions
2013-06-01 15:56:20 +02:00
1c0c93479e
clouds_walking: Added entry refinement
2013-05-31 21:36:59 +02:00
a484479fb7
clouds_walking: Added iterator system for walking
2013-05-29 22:16:09 +02:00
6e8e1bc307
WIP on clouds walking
2013-05-28 22:43:51 +02:00
d6663d84c6
Small fix
2013-05-28 16:25:29 +02:00
7029d78365
Merge branch 'master' into perspective_correction
2013-05-28 15:00:02 +02:00
a6ab7f7146
Started tests on pespective correct mapping
2013-05-28 14:56:50 +02:00
af3e0c2fe6
Draft for new cloud walking algorithm
2013-05-27 22:26:56 +02:00
5e4b4e59a9
Working on clouds walking
2013-05-25 17:13:20 +02:00
b7f64c6d79
Made master branch work again regarding clouds
2013-05-25 16:29:36 +02:00
fdf77b095f
Fix for Qt5
2013-05-25 15:46:00 +02:00
4a7fe29a5c
Use ui header file to find widgets rather than search them by name
2013-05-25 15:33:37 +02:00
31ae2d3a49
Added dist + fixed small compiling problem
2013-05-25 15:16:10 +02:00
3fdb42ba0e
paysages : Started clouds refactoring with unit tests (WIP).
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@576 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-18 21:43:19 +00:00
6420103652
paysages: WIP
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@573 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-14 20:32:56 +00:00
e820d336a8
paysages : Now the terrain leads the water height (relative to terrain scaling).
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@569 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-11 21:34:30 +00:00
b5b3e401db
paysages: WIP
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@568 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-10 15:40:49 +00:00
e116d01c29
paysages: Made terrain preview work again
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@567 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-10 08:10:07 +00:00
319d33e9f2
paysages: Terrain tab redesign (WIP)
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@566 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-09 20:33:37 +00:00
c9256e240c
paysages: Terrain tab redesign (WIP)
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@565 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-09 17:13:04 +00:00
e082fedd19
paysages: New terrain main form (WIP)
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@564 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-05 16:42:55 +00:00
1a193f4e78
paysages: Terrain painting dialog (WIP)
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@563 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-05-05 13:37:06 +00:00
b7b483f673
paysages : Terrain painting WIP.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@562 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-28 19:34:35 +00:00
53a29d5015
paysages : Terrain painting WIP.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@561 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-28 13:32:10 +00:00
8c639ebb77
paysages : Renaming.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@560 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-28 11:43:41 +00:00
48ce97e4cb
paysages : WIP.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@559 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-27 21:40:31 +00:00
9a4cf159ee
paysages : Camera refactoring.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@558 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-27 19:41:57 +00:00
a9c37d2ad5
paysages: More unit testing
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@557 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-22 14:53:16 +00:00
0e0b39f576
paysages : Start of unit testing (WIP).
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@555 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-20 11:28:56 +00:00
541bfa1f00
paysages : Terrain painting improvements (WIP).
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@554 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-20 09:32:59 +00:00
306a3fdd0b
paysages : Terrain painting improvements (WIP).
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@553 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-19 21:51:17 +00:00
ae19273d18
paysages: Project tree reorganization
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@552 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2013-04-17 12:29:51 +00:00
bfd25bcf42
paysages: Refactoring sources (WIP)
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@199 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-23 22:00:19 +00:00
501ccd10ba
paysages: Added water depth color.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@198 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-19 20:59:39 +00:00
35e9d5d0bf
paysages: Added sun rendering.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@197 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-18 21:59:33 +00:00
d8dfb6c1ab
paysages: Small changes
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@196 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-17 15:54:10 +00:00
d61539e08d
paysages: GUI for sky (WIP)
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@195 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-17 14:46:09 +00:00
cb17818068
paysages: Sky refactoring + GUI (WIP)
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@194 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-17 10:55:37 +00:00
680a8e8c32
paysages: Small clouds lighting improvement.
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@193 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-16 18:13:50 +00:00
763e75f77e
reorganize
...
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@191 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
2011-12-10 13:25:22 +00:00